Smartswitch support for container checker and frr (sonic-net#19729)

[Smartswitch] support for container checker and frr

Author: rameshraghupathy

dockers/docker-fpm-frr/base_image_files/TSA

@@ -1,12 +1,15 @@
 #!/bin/bash
 
+# Source the platform_utils script
+source "$(dirname "$0")/platform_utils"
+
 # Restrict command to sudo users
 if [ "$EUID" -ne 0 ] ; then
   echo "Root priveleges are needed for this operation"
   exit 1
 fi
 
-if [ -f /etc/sonic/chassisdb.conf ]; then
+if [ -f /etc/sonic/chassisdb.conf ] && [ "$SMARTSWITCH" = false ] ; then
   CHASSIS_TSA_STATE_UPDATE="CHASSIS_APP_DB HMSET "BGP_DEVICE_GLOBAL\|STATE" tsa_enabled "true""
   CONFIG_DB_TSA_STATE_UPDATE='{"BGP_DEVICE_GLOBAL":{"STATE":{"tsa_enabled": "true"}}}'
   current_tsa_state="$(sonic-cfggen -d -v BGP_DEVICE_GLOBAL.STATE.tsa_enabled)"

dockers/docker-fpm-frr/base_image_files/TSB

@@ -1,12 +1,15 @@
 #!/bin/bash
 
+# Source the platform_utils script
+source "$(dirname "$0")/platform_utils"
+
 # Restrict command to sudo users
 if [ "$EUID" -ne 0 ] ; then
   echo "Root priveleges are needed for this operation"
   exit 1
 fi
 
-if [ -f /etc/sonic/chassisdb.conf ]; then
+if [ -f /etc/sonic/chassisdb.conf ] && [ "$SMARTSWITCH" = false ] ; then
   CHASSIS_TSA_STATE_UPDATE="CHASSIS_APP_DB HMSET "BGP_DEVICE_GLOBAL\|STATE" tsa_enabled "false""
   CONFIG_DB_TSA_STATE_UPDATE='{"BGP_DEVICE_GLOBAL":{"STATE":{"tsa_enabled": "false"}}}'
   current_tsa_state="$(sonic-cfggen -d -v BGP_DEVICE_GLOBAL.STATE.tsa_enabled)"

dockers/docker-fpm-frr/base_image_files/TSC

@@ -1,12 +1,15 @@
 #!/bin/bash
 
+# Source the platform_utils script
+source "$(dirname "$0")/platform_utils"
+
 # Restrict command to sudo users
 if [ "$EUID" -ne 0 ] ; then
   echo "Root priveleges are needed for this operation"
   exit 1
 fi
 
-if [ -f /etc/sonic/chassisdb.conf ]; then
+if [ -f /etc/sonic/chassisdb.conf ] && [ "$SMARTSWITCH" = false ] ; then
   if [[ $1 == "no-stats" ]]; then
     rexec all -c "sudo TSC no-stats"
   else

dockers/docker-fpm-frr/base_image_files/platform_utils

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# platform_utils
+
+# Determine platform and is smartswitch
+PLATFORM="$(sonic-cfggen -d -v DEVICE_METADATA.localhost.platform)"
+SMARTSWITCH=false
+PLATFORM_JSON=/usr/share/sonic/device/$PLATFORM/platform.json
+
+if [ -f "$PLATFORM_JSON" ]; then
+    NUM_DPU=$(jq -r '.DPUS | length' $PLATFORM_JSON 2>/dev/null)
+    if [[ $NUM_DPU -gt 0 ]]; then
+        SMARTSWITCH=true
+    fi
+fi
+
+# Export SMARTSWITCH for other scripts
+export SMARTSWITCH

dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2

@@ -28,7 +28,7 @@ stdout_logfile=syslog
 stderr_logfile=syslog
 dependent_startup=true
 
-{% if not skip_chassisd and IS_MODULAR_CHASSIS == 1 %}
+{% if not skip_chassisd and (IS_MODULAR_CHASSIS == 1 or is_smartswitch) %}
 [program:chassisd]
 command=/usr/local/bin/chassisd
 priority=3

files/image_config/monit/container_checker

@@ -109,8 +109,15 @@ def get_expected_running_containers():
             else:
                 always_running_containers.add(container_name)
 
-    if device_info.is_supervisor():
+    if device_info.is_supervisor() or device_info.is_smartswitch():
         always_running_containers.add("database-chassis")
+
+    if device_info.is_smartswitch():
+        raw_dpustable = config_db.get_table("DPUS")
+        for dpu_name in raw_dpustable:
+            container_name = f"databasedpu{dpu_name.replace('dpu', '')}"
+            always_running_containers.add(container_name)
+
     return expected_running_containers, always_running_containers
 
 def get_current_running_from_DB(always_running_containers):

rules/config

@@ -42,6 +42,9 @@ DEFAULT_BUILD_LOG_TIMESTAMP = none
 # CHANGE_DEFAULT_PASSWORD - enforce default user/users to change password on 1st login
 CHANGE_DEFAULT_PASSWORD ?= n
 
+# Default value for SMARTSWITCH
+SMARTSWITCH ?= 0
+
 # DEFAULT_USERNAME - default username for installer build
 DEFAULT_USERNAME = admin
 
@@ -152,6 +155,11 @@ INCLUDE_DHCP_RELAY = y
 # INCLUDE_DHCP_SERVER - build and install dhcp-server package
 INCLUDE_DHCP_SERVER ?= n
 
+# Conditionally enable DHCP_SERVER when SMARTSWITCH is set to 1
+ifeq ($(SMARTSWITCH), 1)
+    INCLUDE_DHCP_SERVER = y
+endif
+
 # INCLUDE_P4RT - build docker-p4rt for P4RT support
 INCLUDE_P4RT = n
 

src/sonic-py-common/sonic_py_common/device_info.py

@@ -576,6 +576,22 @@ def is_chassis():
     return is_voq_chassis() or is_packet_chassis()
 
 
+def is_smartswitch():
+    # Get platform
+    platform = get_platform()
+    if not platform:
+        return False
+
+    # get platform.json file path
+    platform_json = os.path.join(HOST_DEVICE_PATH, platform, "platform.json")
+    try:
+        with open(platform_json, 'r') as f:
+            platform_cfg = json.loads(f.read())
+            return "DPUS" in platform_cfg
+    except IOError:
+        return False
+
+
 def is_supervisor():
     platform_env_conf_file_path = get_platform_env_conf_file_path()
     if platform_env_conf_file_path is None: