Merge branch '202405' of https://github.com/sonic-net/sonic-buildimage …

…into 202405
jon-nokia · Jan 9, 2025 · 18165a2 · 18165a2
2 parents 36ed950 + 29c4b0f
commit 18165a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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/platform/broadcom/sonic-platform-modules-nokia b/platform/broadcom/sonic-platform-modules-nokia
+32 −6		chassis/utils/hw-management-generate-dump.sh
+2 −1		debian/sonic-platform-nokia-ixr7220h4-32d.install
+3 −0		debian/sonic-platform-nokia-ixr7220h4-32d.postinst
+2 −0		debian/sonic-platform-nokia-ixr7220h4-64d.install
+3 −0		debian/sonic-platform-nokia-ixr7220h4-64d.postinst
+1 −1		ixr7220h4-32d/modules/Makefile
+27 −21		ixr7220h4-32d/modules/h4_32d_cpupld.c
+18 −27		ixr7220h4-32d/modules/h4_32d_swpld2.c
+55 −36		ixr7220h4-32d/modules/h4_32d_swpld3.c
+494 −0		ixr7220h4-32d/modules/rtc-pcf8523.c
+4 −19		ixr7220h4-32d/scripts/h4_32d_platform_init.sh
+123 −0		ixr7220h4-32d/scripts/ports_notify.py
+15 −0		ixr7220h4-32d/service/ports_notify.service
+3 −51		ixr7220h4-32d/sonic_platform/component.py
+1 −4		ixr7220h4-32d/sonic_platform/eeprom.py
+9 −11		ixr7220h4-32d/sonic_platform/fan.py
+1 −8		ixr7220h4-32d/sonic_platform/psu.py
+1 −1		ixr7220h4-32d/sonic_platform/sfp.py
+11 −19		ixr7220h4-32d/sonic_platform/thermal.py
+3 −3		ixr7220h4-32d/sonic_platform/thermal_infos.py
+11 −11		ixr7220h4-64d/modules/fan_cpld.c
+6 −5		ixr7220h4-64d/modules/pdbl_cpld.c
+6 −5		ixr7220h4-64d/modules/pdbr_cpld.c
+16 −13		ixr7220h4-64d/modules/scm_cpld.c
+16 −17		ixr7220h4-64d/modules/smb_cpld.c
+928 −26		ixr7220h4-64d/modules/sys_fpga.c
+11 −5		ixr7220h4-64d/scripts/h4_64d_platform_init.sh
+108 −0		ixr7220h4-64d/scripts/ports_notify.py
+15 −0		ixr7220h4-64d/service/ports_notify.service
+51 −8		ixr7220h4-64d/sonic_platform/psu.py
+1 −1		ixr7220h4-64d/sonic_platform/sfp.py
+37 −3		ixr7220h4-64d/sonic_platform/sfp_event.py
+5 −4		ixr7220h4-64d/sonic_platform/thermal.py