diff --git a/dockers/docker-snmp/snmpd.conf.j2 b/dockers/docker-snmp/snmpd.conf.j2 index b6dd826007..796b041c9c 100644 --- a/dockers/docker-snmp/snmpd.conf.j2 +++ b/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 diff --git a/files/image_config/sonic_release b/files/image_config/sonic_release new file mode 100644 index 0000000000..1ae5085a45 --- /dev/null +++ b/files/image_config/sonic_release @@ -0,0 +1 @@ +202411 diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini index f8d6454d27..4fc49c3314 100644 --- a/platform/checkout/cisco-8000.ini +++ b/platform/checkout/cisco-8000.ini @@ -1,3 +1,3 @@ [module] repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git -ref=202405.0.13 +ref=202411.0.1 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 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 diff --git a/src/dhcpmon b/src/dhcpmon index 22a7467a8a..1fba5dd378 160000 --- a/src/dhcpmon +++ b/src/dhcpmon @@ -1 +1 @@ -Subproject commit 22a7467a8ab3e26c3d20e959a0702380f0d4b5ae +Subproject commit 1fba5dd378e6816588b147baef86351dc06948b5 diff --git a/src/dhcprelay b/src/dhcprelay index 84e4419eef..510054905c 160000 --- a/src/dhcprelay +++ b/src/dhcprelay @@ -1 +1 @@ -Subproject commit 84e4419eef4f9b1fafa86ebb7937fe4904aa0795 +Subproject commit 510054905c548bd38f5661a7a0e928772caca223 diff --git a/src/ptf-py3.patch/0004-Consider-only-expected-packets-for-timeout.patch b/src/ptf-py3.patch/0004-Consider-only-expected-packets-for-timeout.patch new file mode 100644 index 0000000000..4769b1a075 --- /dev/null +++ b/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 +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 + diff --git a/src/ptf-py3.patch/series b/src/ptf-py3.patch/series index 9bbcdfcbfd..21924596f8 100644 --- a/src/ptf-py3.patch/series +++ b/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