Merge pull request sonic-net#523 from Azure/lslmerge202411

Fix conflict in .gitmodule when merging 202411 branch.

dockers/docker-snmp/snmpd.conf.j2

@@ -194,6 +194,9 @@ trapsink {{ v3SnmpTrapIp }}:{{ v3SnmpTrapPort }}{% if v3SnmpTrapVrf != 'None' %}
 #
                                            #  Run as an AgentX master agent
 master          agentx
+agentXTimeout   5
+agentXRetries   4
+
 # internal socket to allow extension to other docker containers
 # Currently the other container using this is docker-fpm-frr
 # make sure this line matches bgp:/etc/snmp/frr.conf 

files/image_config/sonic_release

@@ -0,0 +1 @@
+202411

platform/checkout/cisco-8000.ini

@@ -1,3 +1,3 @@
 [module]
 repo[email protected]:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202405.0.13
+ref=202411.0.1

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

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

src/ptf-py3.patch/0004-Consider-only-expected-packets-for-timeout.patch

@@ -0,0 +1,40 @@
+From f961a46cd8b3736a7ac8534fad774433b2a8ce6b Mon Sep 17 00:00:00 2001
+From: Vinod Kumar <[email protected]>
+Date: Thu, 12 Dec 2024 11:04:21 +0000
+Subject: [PATCH] Consider only expected packets for timeout
+
+"count_matched_packets" method is getting stuck in a while loop as long
+as ptf server port receives any packet (Ex: in dualtor case, we do see
+continuous ICMP packets on ptf port). Fix is to consider only expected
+packets w.r.t timeout (similar to "count_matched_packets_all_ports" logic).
+---
+ src/ptf/testutils.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/ptf/testutils.py b/src/ptf/testutils.py
+index 46b926c..2402e8f 100755
+--- a/src/ptf/testutils.py
++++ b/src/ptf/testutils.py
+@@ -3636,14 +3636,19 @@ def count_matched_packets(test, exp_packet, port, device_number=0, timeout=None)
+             "%s() requires positive timeout value." % sys._getframe().f_code.co_name
+         )
+
++    last_matched_packet_time = time.time()
+     total_rcv_pkt_cnt = 0
+     while True:
++        if (time.time() - last_matched_packet_time) > timeout:
++            break
++
+         result = dp_poll(
+             test, device_number=device_number, port_number=port, timeout=timeout
+         )
+         if isinstance(result, test.dataplane.PollSuccess):
+             if ptf.dataplane.match_exp_pkt(exp_packet, result.packet):
+                 total_rcv_pkt_cnt += 1
++                last_matched_packet_time = time.time()
+         else:
+             break
+
+-- 
+2.43.5
+

src/ptf-py3.patch/series

@@ -1,3 +1,4 @@
 0001-Remove-ord-in-get_mac-to-avoid-TypeError.patch
 0002-Fill-byte-formatted-client-mac-address-in-DHCP-Disco.patch
 0003-Avoid-local-version-scheme-by-setuptools-scm.patch
+0004-Consider-only-expected-packets-for-timeout.patch