Merge pull request sonic-net#522 from mssonicbld/sonicbld/202405-merge

[code sync] Merge code from sonic-net/sonic-buildimage:202405 to 202405

device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/sai.profile

@@ -2,5 +2,5 @@ mode=1
 hwId=et6448m
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/profile.ini
 switchProfile=/usr/share/sonic/hwsku/SAI-M0-48x1G-4x10G.xml
-createSwitchTimeout=90
+createSwitchTimeout=120
 customEVlanUpdate=1

dockers/docker-dhcp-relay/wait_for_intf.sh.j2

@@ -21,25 +21,6 @@ function wait_until_iface_ready
     echo "Interface ${IFACE_NAME} is ready!"
 }
 
-function check_for_ipv6_link_local
-{
-    IFACE_NAME=$1
-    echo "Waiting until interface ${IFACE_NAME} has a link-local ipv6 address configured...."
-
-    # Status of link local address is not populated in STATE_DB
-    while true; do
-        HAS_LL=$(ip -6 addr show ${IFACE_NAME} scope link 2> /dev/null)
-        RC=$?
-        if [[ ${RC} == "0" ]] && [[ ! -z ${HAS_LL} ]]; then
-            break
-        fi
-
-        sleep 1
-    done
-
-    echo "Link-Local address is configured on ${IFACE_NAME}"
-}
-
 # Wait for all interfaces with IPv4 addresses to be up and ready
 # dhcp6relay binds to ipv6 addresses configured on these vlan ifaces
 # Thus check if they are ready before launching dhcp6relay
@@ -55,7 +36,6 @@ wait_until_iface_ready {{ name }} {{ prefix }}
 {% if prefix | ipv6 %}
 {% if DHCP_RELAY and name in DHCP_RELAY %}
 wait_until_iface_ready {{ name }} {{ prefix }}
-check_for_ipv6_link_local {{ name }}
 {% endif %}
 {% endif %}
 {% endfor %}

dockers/docker-snmp/Dockerfile.j2

@@ -66,14 +66,15 @@ RUN apt-get -y purge     \
     find / | grep -E "__pycache__" | xargs rm -rf && \
     rm -rf /debs /python-wheels ~/.cache
 
+COPY ["docker-snmp-init.sh", "/usr/bin/"]
 COPY ["start.sh", "/usr/bin/"]
 COPY ["snmp_yml_to_configdb.py", "/usr/bin/"]
-COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 COPY ["*.j2", "/usr/share/sonic/templates/"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
 COPY ["critical_processes", "/etc/supervisor"]
 
 # Although exposing ports is not needed for host net mode, keep it for possible bridge mode
 EXPOSE 161/udp 162/udp
 
-ENTRYPOINT ["/usr/local/bin/supervisord"]
+RUN chmod +x /usr/bin/docker-snmp-init.sh
+ENTRYPOINT ["/usr/bin/docker-snmp-init.sh"]

dockers/docker-snmp/docker-snmp-init.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+#Generate supervisord.conf based on device metadata
+mkdir -p /etc/supervisor/conf.d/
+sonic-cfggen -d -t /usr/share/sonic/templates/supervisord.conf.j2 > /etc/supervisor/conf.d/supervisord.conf
+exec /usr/local/bin/supervisord

dockers/docker-snmp/supervisord.conf → dockers/docker-snmp/supervisord.conf.j2

@@ -50,7 +50,11 @@ dependent_startup=true
 dependent_startup_wait_for=start:exited
 
 [program:snmp-subagent]
+{% if DEVICE_METADATA['localhost']['switch_type'] == 'chassis-packet' %}
+command=/usr/bin/env python3 -m sonic_ax_impl --enable_dynamic_frequency
+{% else %}
 command=/usr/bin/env python3 -m sonic_ax_impl
+{% endif %}
 priority=4
 autostart=false
 autorestart=false

platform/mellanox/fw.mk

@@ -21,33 +21,33 @@ MLNX_FW_BASE_PATH = $(MLNX_SDK_BASE_PATH)
 # Place an URL here to FW if you want to download FW instead
 MLNX_FW_BASE_URL =
 
-SIMX_VERSION = 24.10-1100
+SIMX_VERSION = 24.10-1101
 
 FW_FROM_URL = y
 
-MLNX_FW_ASSETS_RELEASE_TAG = fw-2014.2110
+MLNX_FW_ASSETS_RELEASE_TAG = fw-2014.2164
 MLNX_FW_ASSETS_URL = $(MLNX_ASSETS_GITHUB_URL)/releases/download/$(MLNX_FW_ASSETS_RELEASE_TAG)
 
 ifeq ($(MLNX_FW_BASE_URL), )
 MLNX_FW_BASE_URL = $(MLNX_FW_ASSETS_URL)
 endif
 
-MLNX_SPC_FW_VERSION = 13.2014.2110
+MLNX_SPC_FW_VERSION = 13.2014.2164
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2014.2110
+MLNX_SPC2_FW_VERSION = 29.2014.2164
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2014.2110
+MLNX_SPC3_FW_VERSION = 30.2014.2164
 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
 $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
 
-MLNX_SPC4_FW_VERSION = 34.2014.2110
+MLNX_SPC4_FW_VERSION = 34.2014.2164
 MLNX_SPC4_FW_FILE = fw-SPC4-rel-$(subst .,_,$(MLNX_SPC4_FW_VERSION))-EVB.mfa
 $(MLNX_SPC4_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC4_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC4_FW_FILE)

platform/mellanox/mlnx-sai.mk

@@ -1,6 +1,6 @@
 # Mellanox SAI
 
-MLNX_SAI_VERSION = SAIBuild2405.30.0.0
+MLNX_SAI_VERSION = SAIBuild2405.30.0.12
 MLNX_SAI_ASSETS_GITHUB_URL = https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins
 MLNX_SAI_ASSETS_RELEASE_TAG = sai-$(MLNX_SAI_VERSION)-$(BLDENV)-$(CONFIGURED_ARCH)
 MLNX_SAI_ASSETS_URL = $(MLNX_SAI_ASSETS_GITHUB_URL)/releases/download/$(MLNX_SAI_ASSETS_RELEASE_TAG)

platform/mellanox/sdk.mk

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-MLNX_SDK_VERSION = 4.7.2110
+MLNX_SDK_VERSION = 4.7.2164
 MLNX_SDK_ISSU_VERSION = 101
 
 MLNX_SDK_DRIVERS_GITHUB_URL = https://github.com/Mellanox/Spectrum-SDK-Drivers

src/sonic-config-engine/tests/sample_output/py2/wait_for_intf.sh

@@ -21,32 +21,12 @@ function wait_until_iface_ready
     echo "Interface ${IFACE_NAME} is ready!"
 }
 
-function check_for_ipv6_link_local
-{
-    IFACE_NAME=$1
-    echo "Waiting until interface ${IFACE_NAME} has a link-local ipv6 address configured...."
-
-    # Status of link local address is not populated in STATE_DB
-    while true; do
-        HAS_LL=$(ip -6 addr show ${IFACE_NAME} scope link 2> /dev/null)
-        RC=$?
-        if [[ ${RC} == "0" ]] && [[ ! -z ${HAS_LL} ]]; then
-            break
-        fi
-
-        sleep 1
-    done
-
-    echo "Link-Local address is configured on ${IFACE_NAME}"
-}
-
 # Wait for all interfaces with IPv4 addresses to be up and ready
 # dhcp6relay binds to ipv6 addresses configured on these vlan ifaces
 # Thus check if they are ready before launching dhcp6relay
 wait_until_iface_ready Vlan2000 192.168.200.1/27
 wait_until_iface_ready Vlan1000 192.168.0.1/27
 wait_until_iface_ready Vlan1000 fc02:2000::2/24
-check_for_ipv6_link_local Vlan1000
 wait_until_iface_ready PortChannel02 10.0.0.58/31
 wait_until_iface_ready PortChannel03 10.0.0.60/31
 wait_until_iface_ready PortChannel04 10.0.0.62/31

src/sonic-config-engine/tests/sample_output/py3/wait_for_intf.sh

@@ -21,30 +21,10 @@ function wait_until_iface_ready
     echo "Interface ${IFACE_NAME} is ready!"
 }
 
-function check_for_ipv6_link_local
-{
-    IFACE_NAME=$1
-    echo "Waiting until interface ${IFACE_NAME} has a link-local ipv6 address configured...."
-
-    # Status of link local address is not populated in STATE_DB
-    while true; do
-        HAS_LL=$(ip -6 addr show ${IFACE_NAME} scope link 2> /dev/null)
-        RC=$?
-        if [[ ${RC} == "0" ]] && [[ ! -z ${HAS_LL} ]]; then
-            break
-        fi
-
-        sleep 1
-    done
-
-    echo "Link-Local address is configured on ${IFACE_NAME}"
-}
-
 # Wait for all interfaces with IPv4 addresses to be up and ready
 # dhcp6relay binds to ipv6 addresses configured on these vlan ifaces
 # Thus check if they are ready before launching dhcp6relay
 wait_until_iface_ready Vlan1000 fc02:2000::2/24
-check_for_ipv6_link_local Vlan1000
 wait_until_iface_ready Vlan1000 192.168.0.1/27
 wait_until_iface_ready Vlan2000 192.168.200.1/27
 wait_until_iface_ready PortChannel01 10.0.0.56/31