Merge branch 'master' into srv6

.github/workflows/protect-file.yml

@@ -0,0 +1,37 @@
+name: Protect certain files to avoid further changes
+
+on:
+  push:
+    branches:
+      - 'master'
+      - '202[2-9][0-9][0-9]'
+  pull_request:
+    branches:
+      - 'master'
+      - '202[2-9][0-9][0-9]'
+
+jobs:
+  check-file:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Fetch base branch
+        run: |
+          git fetch origin ${GITHUB_BASE_REF}
+
+      - name: Check protected files
+        run: |
+          echo "Starting file check step"
+          protected_files=('src/sonic-config-engine/minigraph.py' 'files/build_templates/init_cfg.json.j2')
+          base_branch=$(git rev-parse origin/${GITHUB_BASE_REF})
+          
+          for protected_file in "${protected_files[@]}"; do
+            echo "Checking ${protected_file}"
+            if git diff --name-only $base_branch | grep -q "^${protected_file}\$"; then
+              echo "Error: You are trying to modify ${protected_file}, which is protected."
+              exit 1
+            fi
+          done
+          echo "No changes detected in protected files"

device/arista/x86_64-arista_7800_sup/chassisdb.conf

@@ -3,4 +3,4 @@ chassis_db_address=127.100.1.1
 midplane_subnet=127.100.0.0/16
 
 lag_id_start=1
-lag_id_end=1024
+lag_id_end=1023

device/arista/x86_64-arista_common/pmon_daemon_control_linecard.json

@@ -1,5 +1,6 @@
 {
     "skip_fancontrol": true,
-    "skip_pcied": true
+    "skip_pcied": true,
+    "enable_xcvrd_sff_mgr": true
 }
 

dockers/docker-fpm-frr/frr/bgpd/templates/internal/peer-group.conf.j2

@@ -5,6 +5,7 @@
   neighbor INTERNAL_PEER_V6 peer-group
 {% if CONFIG_DB__DEVICE_METADATA['localhost']['switch_type'] == 'chassis-packet' %}
   neighbor INTERNAL_PEER_V4 update-source Loopback4096
+  neighbor INTERNAL_PEER_V4 ttl-security hops 1
 {% endif %}
   address-family ipv4
 {% if CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %}
@@ -15,10 +16,10 @@
     neighbor INTERNAL_PEER_V4 route-map FROM_BGP_INTERNAL_PEER_V4 in
     neighbor INTERNAL_PEER_V4 route-map TO_BGP_INTERNAL_PEER_V4 out
     neighbor INTERNAL_PEER_V4 send-community
-    neighbor INTERNAL_PEER_V4 ttl-security hops 1
   exit-address-family
 {% if CONFIG_DB__DEVICE_METADATA['localhost']['switch_type'] == 'chassis-packet' %}
   neighbor INTERNAL_PEER_V6 update-source Loopback4096
+  neighbor INTERNAL_PEER_V6 ttl-security hops 1
 {% endif %}
   address-family ipv6
 {% if CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %}
@@ -29,7 +30,6 @@
     neighbor INTERNAL_PEER_V6 route-map FROM_BGP_INTERNAL_PEER_V6 in
     neighbor INTERNAL_PEER_V6 route-map TO_BGP_INTERNAL_PEER_V6 out
     neighbor INTERNAL_PEER_V6 send-community
-    neighbor INTERNAL_PEER_V6 ttl-security hops 1
   exit-address-family
 !
 ! end of template: bgpd/templates/internal/peer-group.conf.j2

dockers/docker-ptf/Dockerfile.j2

@@ -52,6 +52,11 @@ RUN apt-get update          \
         libboost-atomic1.71.0 \
 {% else %}
         libboost-atomic1.74.0 \
+        flex                  \
+        bison                 \
+        tcpd                  \
+        libwrap0              \
+        libwrap0-dev          \
 {% endif %}
         less                \
         git                 \
@@ -73,8 +78,6 @@ RUN apt-get update          \
         python3-scapy       \
         python3-six         \
         libpcap-dev         \
-# TODO check if tacacs+ is required by tests
-# tacacs+ has been dropped from bullseye
 {% if PTF_ENV_PY_VER == "mixed" %}
         tacacs+             \
 {% endif %}
@@ -168,6 +171,16 @@ RUN rm -rf /debs \
     && cd /opt             \
     && wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py
 
+{% if PTF_ENV_PY_VER == "py3" %}
+RUN git clone https://github.com/facebook/tac_plus \
+    && cd tac_plus \
+    && cd tacacs-F4.0.4.28 \
+    && ./configure \
+    && make install \
+    && ln -s /usr/local/sbin/tac_plus /usr/sbin/tac_plus \
+    && ln -s /usr/local/bin/tac_pwd /usr/sbin/tac_pwd
+{% endif %}
+
 {% if PTF_ENV_PY_VER == "mixed" %}
 RUN python3 -m venv --system-site-packages env-python3
 # Activating a virtualenv. The virtualenv automatically works for RUN, ENV and CMD.

files/image_config/interfaces/interfaces.j2

@@ -131,6 +131,7 @@ iface {{ name }} {{ 'inet' if prefix | ipv4 else 'inet6' }} static
 {# TODO: COPP policy type rules #}
 {% endfor %}
 {% else %}
+{% if not (DEVICE_METADATA['localhost']['subtype'] == 'SmartSwitch' and DEVICE_METADATA['localhost']['switch_type'] == 'dpu') %}
 auto eth0
 iface eth0 inet dhcp
     metric 202
@@ -142,6 +143,7 @@ iface eth0 inet6 dhcp
     down sysctl net.ipv6.conf.eth0.accept_ra=0
 {% endif %}
 {% endif %}
+{% endif %}
 #
 source /etc/network/interfaces.d/*
 #

platform/broadcom/sai.mk

@@ -1,6 +1,6 @@
-LIBSAIBCM_XGS_VERSION = 11.2.13.1
+LIBSAIBCM_XGS_VERSION = 11.2.16.2
 LIBSAIBCM_DNX_VERSION = 11.2.13.1-1
-LIBSAIBCM_XGS_BRANCH_NAME = SAI_11.2.0_GA
+LIBSAIBCM_XGS_BRANCH_NAME = SAI_11.2.16.2
 LIBSAIBCM_DNX_BRANCH_NAME = SAI_11.2.0_GA
 LIBSAIBCM_XGS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/sai-broadcom/$(LIBSAIBCM_XGS_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)/xgs"
 LIBSAIBCM_DNX_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/sai-broadcom/$(LIBSAIBCM_DNX_BRANCH_NAME)/$(LIBSAIBCM_DNX_VERSION)/dnx"

platform/checkout/cisco-8000.ini

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

platform/mellanox/issu-version.mk

@@ -19,7 +19,7 @@
 ISSU_VERSION_FILE = issu-version
 $(ISSU_VERSION_FILE)_SRC_PATH = $(PLATFORM_PATH)/issu-version
 
-$(ISSU_VERSION_FILE)_DEPENDS += $(APPLIBS)
+$(ISSU_VERSION_FILE)_DEPENDS += $(SYSSDK)
 
 SONIC_MAKE_FILES += $(ISSU_VERSION_FILE)
 

platform/mellanox/rules.dep

@@ -16,5 +16,4 @@ include $(PLATFORM_PATH)/issu-version.dep
 include $(PLATFORM_PATH)/mlnx-onie-fw-update.dep
 include $(PLATFORM_PATH)/mlnx-ssd-fw-update.dep
 include $(PLATFORM_PATH)/install-pending-fw.dep
-include $(PLATFORM_PATH)/component-versions.dep
 include $(PLATFORM_PATH)/rshim.dep