diff --git a/config/chassis_modules.py b/config/chassis_modules.py
index 4e7fd8096b..0699a6f766 100755
--- a/config/chassis_modules.py
+++ b/config/chassis_modules.py
@@ -5,6 +5,7 @@
 import re
 import subprocess
 import utilities_common.cli as clicommon
+from utilities_common.chassis import is_smartswitch, get_all_dpus
 
 TIMEOUT_SECS = 10
 
@@ -27,7 +28,10 @@ def get_config_module_state(db, chassis_module_name):
     config_db = db.cfgdb
     fvs = config_db.get_entry('CHASSIS_MODULE', chassis_module_name)
     if not fvs:
-        return 'up'
+        if is_smartswitch():
+            return 'down'
+        else:
+            return 'up'
     else:
         return fvs['admin_status']
 
@@ -102,7 +106,11 @@ def fabric_module_set_admin_status(db, chassis_module_name, state):
 #
 @modules.command('shutdown')
 @clicommon.pass_db
-@click.argument('chassis_module_name', metavar='<module_name>', required=True)
+@click.argument('chassis_module_name',
+                metavar='<module_name>',
+                required=True,
+                type=click.Choice(get_all_dpus(), case_sensitive=False) if is_smartswitch() else str
+                )
 def shutdown_chassis_module(db, chassis_module_name):
     """Chassis-module shutdown of module"""
     config_db = db.cfgdb
@@ -110,8 +118,9 @@ def shutdown_chassis_module(db, chassis_module_name):
 
     if not chassis_module_name.startswith("SUPERVISOR") and \
        not chassis_module_name.startswith("LINE-CARD") and \
-       not chassis_module_name.startswith("FABRIC-CARD"):
-        ctx.fail("'module_name' has to begin with 'SUPERVISOR', 'LINE-CARD' or 'FABRIC-CARD'")
+       not chassis_module_name.startswith("FABRIC-CARD") and \
+       not chassis_module_name.startswith("DPU"):
+        ctx.fail("'module_name' has to begin with 'SUPERVISOR', 'LINE-CARD', 'FABRIC-CARD', 'DPU'")
 
     # To avoid duplicate operation
     if get_config_module_state(db, chassis_module_name) == 'down':
@@ -130,7 +139,11 @@ def shutdown_chassis_module(db, chassis_module_name):
 #
 @modules.command('startup')
 @clicommon.pass_db
-@click.argument('chassis_module_name', metavar='<module_name>', required=True)
+@click.argument('chassis_module_name',
+                metavar='<module_name>',
+                required=True,
+                type=click.Choice(get_all_dpus(), case_sensitive=False) if is_smartswitch() else str
+                )
 def startup_chassis_module(db, chassis_module_name):
     """Chassis-module startup of module"""
     config_db = db.cfgdb
@@ -142,7 +155,12 @@ def startup_chassis_module(db, chassis_module_name):
         return
 
     click.echo("Starting up chassis module {}".format(chassis_module_name))
-    config_db.set_entry('CHASSIS_MODULE', chassis_module_name, None)
+    if is_smartswitch():
+        fvs = {'admin_status': 'up'}
+        config_db.set_entry('CHASSIS_MODULE', chassis_module_name, fvs)
+    else:
+        config_db.set_entry('CHASSIS_MODULE', chassis_module_name, None)
+
     if chassis_module_name.startswith("FABRIC-CARD"):
         if not check_config_module_state_with_timeout(ctx, db, chassis_module_name, 'up'):
             fabric_module_set_admin_status(db, chassis_module_name, 'up')
diff --git a/doc/Command-Reference.md b/doc/Command-Reference.md
index 689ca23b73..0a187450bc 100644
--- a/doc/Command-Reference.md
+++ b/doc/Command-Reference.md
@@ -713,6 +713,32 @@ This command displays the cause of the previous reboot
   User issued reboot command [User: admin, Time: Mon Mar 25 01:02:03 UTC 2019]
   ```
 
+```
+Note: The CLI extensions shown in this block are applicable only to smartswitch platforms. When these extensions are used on a regular switch the extension will be ignored and the output will be the same irrespective of the options.
+
+CLI Extensions Applicable to Smartswtich
+  - show reboot-cause all
+  - show reboot-cause history all
+  - show reboot-cause history DPUx
+```
+**show reboot-cause all**
+
+This command displays the cause of the previous reboot for the Switch and the DPUs for which the midplane interfaces are up.
+
+- Usage:
+  ```
+  show reboot-cause all
+  ```
+
+- Example:
+  ```
+  root@MtFuji:~$  show reboot-cause all
+  Device    Name                 Cause                      Time    User
+  --------  -------------------  ----------                 ------  ------
+  NPU       2024_07_24_20_43_22  Power Loss                 N/A     N/A
+  DPU2      2024_07_24_20_43_22  Software causes (Reboot)   N/A     N/A
+  DPU1      2024_07_24_20_43_22  Software causes (Reboot)   N/A     N/A
+  ```
 **show reboot-cause history**
 
 This command displays the history of the previous reboots up to 10 entry
@@ -733,6 +759,42 @@ This command displays the history of the previous reboots up to 10 entry
   2020_10_09_04_53_58  warm-reboot  Fri Oct  9 04:51:47 UTC 2020  admin
   ```
 
+**show reboot-cause history all**
+
+This command displays the history of the previous reboots up to 10 entry of the Switch and the DPUs for which the midplane interfaces are up.
+
+- Usage:
+  ```
+  show reboot-cause history all
+  ```
+
+- Example:
+  ```
+  root@MtFuji:~# show reboot-cause history all
+  Device    Name                 Cause                                      Time                             User    Comment
+  --------  -------------------  -----------------------------------------  -------------------------------  ------  -------
+  NPU       2024_07_23_23_06_57  Kernel Panic                               Tue Jul 23 11:02:27 PM UTC 2024  N/A     N/A
+  NPU       2024_07_23_11_21_32  Power Loss                                 N/A                              N/A     Unknown
+  ```
+
+**show reboot-cause history DPU1**
+
+This command displays the history of the previous reboots up to 10 entry of DPU1. If DPU1 is powered down then there won't be any data in the DB and the "show reboot-cause history DPU1" output will be blank.
+
+- Usage:
+  ```
+  show reboot-cause history DPU1
+  ```
+
+- Example:
+  ```
+  root@MtFuji:~# show reboot-cause history DPU1
+  Device    Name    Cause                                      Time    User    Comment
+  --------  ------  -----------------------------------------  ------  ------  ---------
+  DPU1      DPU1    Software causes (Hardware watchdog reset)  N/A     N/A     N/A
+  ```
+
+
 **show uptime**
 
 This command displays the current system uptime
@@ -11165,6 +11227,36 @@ In addition, displays a list of all current 'Services' and 'Hardware' being moni
   psu.voltage  Ignored   Device
   ```
 
+**show system-health dpu <option>**
+
+This is a smartswitch specific cli.  This cli shows the midplane, control plane and data plane health of the DPU modules in the smartswitch.
+
+This can take two forms of "<option>" 1. DPU module name (ex: DPU0) 2. all, which will list all the DPUs in the smartswitch
+
+- Usage:
+  ```
+  show system-health dpu DPU0
+  ```
+
+- Example:
+  ```
+root@MtFuji-dut:/home/cisco# show system-health dpu DPU0
+Name    Oper-Status    State-Detail             State-Value    Time                             Reason
+------  -------------  -----------------------  -------------  -------------------------------  ------------------------------------------------------------------------------------
+DPU0    Online         dpu_midplane_link_state  up             Mon Dec 23 05:12:17 PM UTC 2024
+                       dpu_control_plane_state  up             Mon Dec 23 05:12:17 PM UTC 2024 All containers are up and running, host-ethlink-status: Uplink1/1 is UP
+                       dpu_data_plane_state     up             Mon Dec 23 05:12:17 PM UTC 2024 DPU container named polaris is running, pdsagent running : OK, pciemgrd running : OK
+
+root@MtFuji-dut:/home/cisco# show system-health dpu all
+Name    Oper-Status    State-Detail             State-Value    Time                             Reason
+------  -------------  -----------------------  -------------  -------------------------------  ------------------------------------------------------------------------------------
+DPU0    Online         dpu_midplane_link_state  up             Mon Dec 23 05:12:17 PM UTC 2024
+                       dpu_control_plane_state  up             Mon Dec 23 05:12:17 PM UTC 2024 All containers are up and running, host-ethlink-status: Uplink1/1 is UP
+                       dpu_data_plane_state     up             Mon Dec 23 05:12:17 PM UTC 2024 DPU container named polaris is running, pdsagent running : OK, pciemgrd running : OK
+DPU1    Online         dpu_midplane_link_state  up             Mon Dec 23 05:12:17 PM UTC 2024
+                       dpu_control_plane_state  up             Mon Dec 23 05:12:17 PM UTC 2024 All containers are up and running, host-ethlink-status: Uplink1/1 is UP
+                       dpu_data_plane_state     up             Mon Dec 23 05:12:17 PM UTC 2024 DPU container named polaris is running, pdsagent running : OK, pciemgrd running : OK
+
 Go Back To [Beginning of the document](#) or [Beginning of this section](#System-Health)
 
 ## VLAN & FDB
diff --git a/show/chassis_modules.py b/show/chassis_modules.py
index b94d8d620d..1a9ea2b710 100644
--- a/show/chassis_modules.py
+++ b/show/chassis_modules.py
@@ -2,6 +2,7 @@
 from natsort import natsorted
 from tabulate import tabulate
 from swsscommon.swsscommon import SonicV2Connector
+from utilities_common.chassis import is_smartswitch
 
 import utilities_common.cli as clicommon
 from sonic_py_common import multi_asic
@@ -40,11 +41,11 @@ def status(db, chassis_module_name):
     state_db = SonicV2Connector(host="127.0.0.1")
     state_db.connect(state_db.STATE_DB)
 
-    key_pattern = '*'
+    key_pattern = CHASSIS_MODULE_INFO_TABLE + '|*'
     if chassis_module_name:
-        key_pattern = '|' + chassis_module_name
+        key_pattern = CHASSIS_MODULE_INFO_TABLE + '|' + chassis_module_name
 
-    keys = state_db.keys(state_db.STATE_DB, CHASSIS_MODULE_INFO_TABLE + key_pattern)
+    keys = state_db.keys(state_db.STATE_DB, key_pattern)
     if not keys:
         print('Key {} not found in {} table'.format(key_pattern, CHASSIS_MODULE_INFO_TABLE))
         return
@@ -62,7 +63,10 @@ def status(db, chassis_module_name):
         oper_status = data_dict[CHASSIS_MODULE_INFO_OPERSTATUS_FIELD]
         serial = data_dict[CHASSIS_MODULE_INFO_SERIAL_FIELD]
 
-        admin_status = 'up'
+        if is_smartswitch():
+            admin_status = 'down'
+        else:
+            admin_status = 'up'
         config_data = chassis_cfg_table.get(key_list[1])
         if config_data is not None:
             admin_status = config_data.get(CHASSIS_MODULE_INFO_ADMINSTATUS_FIELD)
diff --git a/show/reboot_cause.py b/show/reboot_cause.py
old mode 100755
new mode 100644
index 57bd15e863..07ea94e714
--- a/show/reboot_cause.py
+++ b/show/reboot_cause.py
@@ -6,11 +6,12 @@
 from tabulate import tabulate
 from swsscommon.swsscommon import SonicV2Connector
 import utilities_common.cli as clicommon
+from utilities_common.chassis import is_smartswitch, get_all_dpu_options
 
+CHASSIS_SERVER_PORT = 6380
 
 PREVIOUS_REBOOT_CAUSE_FILE_PATH = "/host/reboot-cause/previous-reboot-cause.json"
 
-
 def read_reboot_cause_file():
     reboot_cause_dict = {}
 
@@ -24,6 +25,112 @@ def read_reboot_cause_file():
     return reboot_cause_dict
 
 
+# Function to fetch reboot cause data from database
+def fetch_data_from_db(module_name, fetch_history=False, use_chassis_db=False):
+    if module_name is None:
+        prefix = 'REBOOT_CAUSE|2'
+    elif "DPU" in module_name:
+        prefix = 'REBOOT_CAUSE|' + module_name
+    else:
+        prefix = 'REBOOT_CAUSE|'
+
+    try:
+        if use_chassis_db:
+            rdb = SonicV2Connector(host='redis_chassis.server', port=CHASSIS_SERVER_PORT)
+            rdb.connect(rdb.CHASSIS_STATE_DB)
+            table_keys = rdb.keys(rdb.CHASSIS_STATE_DB, prefix+'*')
+        else:
+            rdb = SonicV2Connector(host='127.0.0.1')
+            rdb.connect(rdb.STATE_DB, False)   # Make one attempt only
+            table_keys = rdb.keys(rdb.STATE_DB, prefix+'*')
+    except Exception:
+        return []
+
+    if table_keys is not None:
+        table_keys.sort(reverse=True)
+
+    table = []
+    d = []
+    for tk in table_keys:
+        r = []
+        append = False
+        if use_chassis_db:
+            entry = rdb.get_all(rdb.CHASSIS_STATE_DB, tk)
+        else:
+            entry = rdb.get_all(rdb.STATE_DB, tk)
+
+        if module_name is not None:
+            if 'device' in entry:
+                module = entry['device']
+            elif "DPU" in tk:
+                module = tk.split('|')[1]
+            else:
+                module = "NPU"
+
+            if module_name != module and module_name != "all":
+                continue
+            if module in d and not fetch_history:
+                append = False
+                continue
+            elif module not in d or (module in d and fetch_history):
+                if module not in d:
+                    d.append(module)
+                    append = True
+
+            r.append(module)
+
+        name = tk.split('|')[-1]
+        if "|" in name:
+            name = name[:name.rindex('|')] + ''
+        r.append(name)
+        r.append(entry['cause'] if 'cause' in entry else "")
+        r.append(entry['time'] if 'time' in entry else "")
+        r.append(entry['user'] if 'user' in entry else "")
+        if append and not fetch_history:
+            table.append(r)
+        elif fetch_history:
+            r.append(entry['comment'] if 'comment' in entry else "")
+            if module_name is None or module_name == 'all' or "DPU" in module:
+                table.append(r)
+
+    return table
+
+
+# Wrapper-function to fetch reboot cause data from database
+def fetch_reboot_cause_from_db(module_name):
+    table = []
+    r = []
+
+    # Read the previous reboot cause
+    reboot_cause_dict = read_reboot_cause_file()
+    reboot_gen_time = reboot_cause_dict.get("gen_time", "N/A")
+    reboot_cause = reboot_cause_dict.get("cause", "Unknown")
+    reboot_time = reboot_cause_dict.get("time", "N/A")
+    reboot_user = reboot_cause_dict.get("user", "N/A")
+
+    r.append("NPU")
+    r.append(reboot_gen_time if reboot_gen_time else "")
+    r.append(reboot_cause if reboot_cause else "")
+    r.append(reboot_time if reboot_time else "")
+    r.append(reboot_user if reboot_user else "")
+    table.append(r)
+
+    table += fetch_data_from_db(module_name, fetch_history=False, use_chassis_db=True)
+    return table
+
+
+# Function to fetch reboot cause history data from database REBOOT_CAUSE table
+def fetch_reboot_cause_history_from_db(module_name):
+    if module_name == "all":
+        # Combine data from both Redis containers for "all" modules
+        data_switch = fetch_data_from_db(module_name, fetch_history=True, use_chassis_db=False)
+        data_dpu = fetch_data_from_db(module_name, fetch_history=True, use_chassis_db=True)
+        return data_switch + data_dpu
+    elif module_name is None:
+        return fetch_data_from_db(module_name, fetch_history=True, use_chassis_db=False)
+    else:
+        return fetch_data_from_db(module_name, fetch_history=True, use_chassis_db=True)
+
 #
 # 'reboot-cause' group ("show reboot-cause")
 #
@@ -62,33 +169,35 @@ def reboot_cause(ctx):
         click.echo(reboot_cause_str)
 
 
-# 'history' subcommand ("show reboot-cause history")
+# 'all' command within 'reboot-cause'
 @reboot_cause.command()
-def history():
-    """Show history of reboot-cause"""
-    REBOOT_CAUSE_TABLE_NAME = "REBOOT_CAUSE"
-    TABLE_NAME_SEPARATOR = '|'
-    db = SonicV2Connector(host='127.0.0.1')
-    db.connect(db.STATE_DB, False)   # Make one attempt only
-    prefix = REBOOT_CAUSE_TABLE_NAME + TABLE_NAME_SEPARATOR
-    _hash = '{}{}'.format(prefix, '*')
-    table_keys = db.keys(db.STATE_DB, _hash)
-    if table_keys is not None:
-        table_keys.sort(reverse=True)
+def all():
+    if not is_smartswitch():
+        return
+    """Show cause of most recent reboot"""
+    reboot_cause_data = fetch_reboot_cause_from_db("all")
+    header = ['Device', 'Name', 'Cause', 'Time', 'User']
+    if reboot_cause_data:
+        click.echo(tabulate(reboot_cause_data, header, numalign="left"))
 
-        table = []
-        for tk in table_keys:
-            entry = db.get_all(db.STATE_DB, tk)
-            r = []
-            r.append(tk.replace(prefix, ""))
-            r.append(entry['cause'] if 'cause' in entry else "")
-            r.append(entry['time'] if 'time' in entry else "")
-            r.append(entry['user'] if 'user' in entry else "")
-            r.append(entry['comment'] if 'comment' in entry else "")
-            table.append(r)
 
-        header = ['Name', 'Cause', 'Time', 'User', 'Comment']
-        click.echo(tabulate(table, header, numalign="left"))
+# 'history' command within 'reboot-cause'
+@reboot_cause.command()
+@click.argument(
+        'module_name',
+        required=False,
+        type=click.Choice(get_all_dpu_options(), case_sensitive=False) if is_smartswitch() else None
+        )
+def history(module_name=None):
+    """Show history of reboot-cause"""
+    if not is_smartswitch() and module_name:
+        click.echo("module option is supported only for smartswitch platform")
+        return
+    reboot_cause_history = fetch_reboot_cause_history_from_db(module_name)
+    if is_smartswitch() and module_name:
+        header = ['Device', 'Name', 'Cause', 'Time', 'User', 'Comment']
     else:
-        click.echo("Reboot-cause history is not yet available in StateDB")
-        sys.exit(1)
+        header = ['Name', 'Cause', 'Time', 'User', 'Comment']
+
+    if reboot_cause_history:
+        click.echo(tabulate(reboot_cause_history, header, numalign="left"))
diff --git a/show/system_health.py b/show/system_health.py
index 1fa92f6592..66724b2e91 100644
--- a/show/system_health.py
+++ b/show/system_health.py
@@ -4,6 +4,14 @@
 import click
 from tabulate import tabulate
 import utilities_common.cli as clicommon
+from swsscommon.swsscommon import SonicV2Connector
+from natsort import natsorted
+from utilities_common.chassis import is_smartswitch, get_all_dpu_options
+
+DPU_STATE = 'DPU_STATE'
+CHASSIS_SERVER = 'redis_chassis.server'
+CHASSIS_SERVER_PORT = 6380
+CHASSIS_STATE_DB = 13
 
 
 def get_system_health_status():
@@ -159,3 +167,81 @@ def sysready_status_detail():
         clicommon.run_command(cmd, display_cmd=False)
     except Exception as e:
         click.echo("Exception: {}".format(str(e)))
+
+
+def show_dpu_state(module_name):
+    chassis_state_db = SonicV2Connector(host=CHASSIS_SERVER, port=CHASSIS_SERVER_PORT)
+    chassis_state_db.connect(chassis_state_db.CHASSIS_STATE_DB)
+    key = 'DPU_STATE|'
+    suffix = '*' if not module_name or not module_name.startswith("DPU") else module_name
+    key = key + suffix
+    keys = chassis_state_db.keys(chassis_state_db.CHASSIS_STATE_DB, key)
+    if not keys:
+        return
+
+    table = []
+    for dbkey in natsorted(keys):
+        key_list = dbkey.split('|')
+        if len(key_list) != 2:  # error data in DB, log it and ignore
+            continue
+        state_info = chassis_state_db.get_all(chassis_state_db.CHASSIS_STATE_DB, dbkey)
+        # Determine operational status
+        midplanedown = False
+        up_cnt = 0
+        for key, value in state_info.items():
+            if key.endswith('_state'):
+                if value.lower() == 'up':
+                    up_cnt = up_cnt + 1
+                if 'midplane' in key and value.lower() == 'down':
+                    midplanedown = True
+
+        if midplanedown:
+            oper_status = "Offline"
+        elif up_cnt == 3:
+            oper_status = "Online"
+        else:
+            oper_status = "Partial Online"
+
+        for dpustates in range(3):
+            if dpustates == 0:
+                row = [key_list[1], oper_status, "", "", "", ""]
+            else:
+                row = ["", "", "", "", "", ""]
+            for key, value in state_info.items():
+                if key == "id":
+                    continue
+                if dpustates == 0 and 'midplane' in key:
+                    populate_row(row, key, value, table)
+                elif dpustates == 1 and 'control' in key:
+                    populate_row(row, key, value, table)
+                elif dpustates == 2 and 'data' in key:
+                    populate_row(row, key, value, table)
+
+    headers = ["Name", "Oper-Status", "State-Detail", "State-Value", "Time", "Reason"]
+    click.echo(tabulate(table, headers=headers))
+
+
+def populate_row(row, key, value, table):
+    if key.endswith('_state'):
+        row[2] = key
+        row[3] = value
+        if "up" in row[3]:
+            row[5] = ""
+        table.append(row)
+    elif key.endswith('_time'):
+        row[4] = value
+    elif key.endswith('_reason'):
+        if "up" not in row[3]:
+            row[5] = value
+
+
+@system_health.command()
+@click.argument('module_name',
+                required=True,
+                type=click.Choice(get_all_dpu_options(), case_sensitive=False) if is_smartswitch() else None
+                )
+def dpu(module_name):
+    """Show system-health dpu information"""
+    if not is_smartswitch():
+        return
+    show_dpu_state(module_name)
diff --git a/tests/reboot_cause_test.py b/tests/reboot_cause_test.py
index f3372c3eb1..8adb63e7ff 100644
--- a/tests/reboot_cause_test.py
+++ b/tests/reboot_cause_test.py
@@ -1,8 +1,8 @@
 import os
 import sys
+import json
 import textwrap
 from unittest import mock
-
 from click.testing import CliRunner
 
 from .mock_tables import dbconnector
@@ -24,10 +24,14 @@
 """
 
 class TestShowRebootCause(object):
+    original_cli = None
+
     @classmethod
     def setup_class(cls):
         print("SETUP")
         os.environ["UTILITIES_UNIT_TESTING"] = "1"
+        global original_cli
+        original_cli = show.cli
 
     # Test 'show reboot-cause' without previous-reboot-cause.json 
     def test_reboot_cause_no_history_file(self):
@@ -55,6 +59,7 @@ def test_reboot_cause_non_user(self):
             result = runner.invoke(show.cli.commands["reboot-cause"], [])
             assert result.output == expected_output
 
+
     # Test 'show reboot-cause history'
     def test_reboot_cause_history(self):
         expected_output = """\
@@ -68,8 +73,114 @@ def test_reboot_cause_history(self):
         print(result.output)
         assert result.output == expected_output
 
+    # Test 'show reboot-cause history all'
+    def test_reboot_cause_history_all(self):
+        runner = CliRunner()
+        result = runner.invoke(show.cli.commands["reboot-cause"].commands["history"], ["all"])
+        print(result.output)
+        expected_output = 'module option is supported only for smartswitch platform'
+        assert expected_output in result.output
+
+    # Test 'show reboot-cause history DPU0'
+    def test_reboot_cause_history_dpu(self):
+        runner = CliRunner()
+        result = runner.invoke(show.cli.commands["reboot-cause"].commands["history"], ["DPU0"])
+        print(result.output)
+        expected_output = 'module option is supported only for smartswitch platform'
+        assert expected_output in result.output
+
+    # Test 'get_all_dpu_options' function
+    def test_get_all_options(self):
+        # Mock is_smartswitch to return True
+        with mock.patch("sonic_py_common.device_info.is_smartswitch", return_value=True):
+
+            # Mock platform info to simulate a valid platform returned from get_platform_info
+            mock_platform_info = {'platform': 'mock_platform'}
+            with mock.patch("sonic_py_common.device_info.get_platform_info", return_value=mock_platform_info):
+
+                # Mock open to simulate reading a platform.json file
+                mock_platform_data = '{"DPUS": {"dpu0": {}, "dpu1": {}}}'
+                with mock.patch("builtins.open", mock.mock_open(read_data=mock_platform_data)):
+
+                    # Mock json.load to return parsed JSON content from the mocked file
+                    with mock.patch("json.load", return_value=json.loads(mock_platform_data)):
+
+                        # Import the actual get_all_dpu_options function and invoke it
+                        from show.reboot_cause import get_all_dpu_options
+                        dpu_list = get_all_dpu_options()
+                        print(dpu_list)
+
+    # Test 'show reboot-cause all on smartswitch'
+    def test_reboot_cause_all(self):
+        # Mock is_smartswitch to return True
+        with mock.patch("sonic_py_common.device_info.is_smartswitch", return_value=True):
+            with mock.patch(
+                "show.reboot_cause.fetch_data_from_db",
+                return_value=[
+                    ["NPU", "2024_12_19_14_00_33", "reboot", "Thu Dec 19 01:55:41 PM UTC 2024", "admin", "N/A"],
+                    ["DPU0", "2024_12_19_14_03_24", "reboot", "Thu Dec 19 02:03:24 PM UTC 2024", "admin", "N/A"]
+                ],
+            ):
+                runner = CliRunner()
+                result = runner.invoke(show.cli.commands["reboot-cause"], ["all"])
+                print(result.output)
+                assert "NPU" in result.output
+
+    # Test 'show reboot-cause history all on smartswitch'
+    def test_smartswitch_reboot_cause_history_all(self):
+        # Mock is_smartswitch to return True
+        with mock.patch("sonic_py_common.device_info.is_smartswitch", return_value=True):
+            with mock.patch(
+                "show.reboot_cause.fetch_data_from_db",
+                return_value=[
+                    ["NPU", "2024_12_19_14_00_33", "reboot", "Thu Dec 19 01:55:41 PM UTC 2024", "admin", "N/A"],
+                    ["DPU0", "2024_12_19_14_03_24", "reboot", "Thu Dec 19 02:03:24 PM UTC 2024", "admin", "N/A"]
+                ],
+            ):
+                runner = CliRunner()
+                result = runner.invoke(show.cli.commands["reboot-cause"].commands["history"], ["all"])
+                print(result.output)
+                assert "NPU" in result.output
+
+    # Test 'show reboot-cause DPU0 on smartswitch'
+    def test_reboot_cause_history_module(self):
+        # Mock is_smartswitch to return True
+        with mock.patch("sonic_py_common.device_info.is_smartswitch", return_value=True):
+            with mock.patch(
+                "show.reboot_cause.fetch_data_from_db",
+                return_value=[
+                    ["DPU0", "2024_12_19_14_03_24", "reboot", "Thu Dec 19 02:03:24 PM UTC 2024", "admin", "N/A"]
+                ],
+            ):
+                runner = CliRunner()
+                result = runner.invoke(show.cli.commands["reboot-cause"].commands["history"], ["DPU0"])
+                print(result.output)
+                assert "DPU" in result.output
+
+    # Test 'show reboot-cause all on smartswitch'
+    def test_reboot_cause_all_non_smartswitch(self):
+        # Mock is_smartswitch to return True
+        with mock.patch("sonic_py_common.device_info.is_smartswitch", return_value=False):
+            with mock.patch(
+                "show.reboot_cause.fetch_data_from_db",
+                return_value=[
+                    ["DPU0", "2024_12_19_14_03_24", "reboot", "Thu Dec 19 02:03:24 PM UTC 2024", "admin", "N/A"],
+                ],
+            ):
+                runner = CliRunner()
+                result = runner.invoke(show.cli.commands["reboot-cause"].commands["all"], [])
+                print(result.output)
+                result = runner.invoke(show.cli.commands["reboot-cause"].commands["history"], ["all"])
+                print(result.output)
+                result = runner.invoke(show.cli.commands["reboot-cause"].commands["history"], ["DPU0"])
+                print(result.output)
+                expected_output = 'module option is supported only for smartswitch platform'
+                assert expected_output in result.output
+
+
     @classmethod
     def teardown_class(cls):
         print("TEARDOWN")
         os.environ["PATH"] = os.pathsep.join(os.environ["PATH"].split(os.pathsep)[:-1])
         os.environ["UTILITIES_UNIT_TESTING"] = "0"
+        show.cli = original_cli
diff --git a/tests/system_health_test.py b/tests/system_health_test.py
index 4a14f52725..ca0a294f50 100644
--- a/tests/system_health_test.py
+++ b/tests/system_health_test.py
@@ -1,9 +1,10 @@
 import sys
 import os
+import json
+from unittest import mock
 
 import click
 from click.testing import CliRunner
-
 from .mock_tables import dbconnector
 
 test_path = os.path.dirname(os.path.abspath(__file__))
@@ -63,11 +64,15 @@ def get_status_led(self):
 import show.main as show
 
 class TestHealth(object):
+    original_cli = None
+
     @classmethod
     def setup_class(cls):
         print("SETUP")
         os.environ["PATH"] += os.pathsep + scripts_path
         os.environ["UTILITIES_UNIT_TESTING"] = "1"
+        global original_cli
+        original_cli = show.cli
 
     def test_health_summary(self):
         runner = CliRunner()
@@ -343,9 +348,92 @@ def test_health_systemready(self):
 swss            OK                OK                  -              -
 """
 
+    def test_health_dpu(self):
+        # Mock is_smartswitch to return True
+        with mock.patch("sonic_py_common.device_info.is_smartswitch", return_value=True):
+
+            # Check if 'dpu' command is available under system-health
+            available_commands = show.cli.commands["system-health"].commands
+            assert "dpu" in available_commands, f"'dpu' command not found: {available_commands}"
+
+            conn = dbconnector.SonicV2Connector()
+            conn.connect(conn.CHASSIS_STATE_DB)
+            conn.set(conn.CHASSIS_STATE_DB, 'DPU_STATE|DPU0', "id", "0")
+            conn.set(conn.CHASSIS_STATE_DB, 'DPU_STATE|DPU0', "dpu_midplane_link_reason", "OK")
+            conn.set(conn.CHASSIS_STATE_DB, 'DPU_STATE|DPU0', "dpu_midplane_link_state", "UP")
+            conn.set(conn.CHASSIS_STATE_DB, 'DPU_STATE|DPU0', "dpu_data_plane_time", "20240607 15:08:51")
+            conn.set(conn.CHASSIS_STATE_DB, 'DPU_STATE|DPU0', "dpu_control_plane_time", "20240608 09:11:13")
+            conn.set(conn.CHASSIS_STATE_DB, 'DPU_STATE|DPU0', "dpu_data_plane_state", "UP")
+            conn.set(conn.CHASSIS_STATE_DB, 'DPU_STATE|DPU0', "dpu_control_plane_reason", "Uplink is UP")
+            conn.set(conn.CHASSIS_STATE_DB, 'DPU_STATE|DPU0', "dpu_control_plane_state", "UP")
+            conn.set(conn.CHASSIS_STATE_DB, 'DPU_STATE|DPU0', "dpu_data_plane_reason", "Polaris is UP")
+            conn.set(conn.CHASSIS_STATE_DB, 'DPU_STATE|DPU0', "dpu_midplane_link_time", "20240608 09:11:13")
+
+            with mock.patch("show.system_health.SonicV2Connector", return_value=conn):
+                runner = CliRunner()
+                result = runner.invoke(show.cli.commands["system-health"].commands["dpu"], ["DPU0"])
+
+                # Assert the output and exit code
+                assert result.exit_code == 0, f"Expected exit code 0, got {result.exit_code}. Output: {result.output}"
+                assert "DPU0" in result.output, f"Expected 'DPU0' in output, got: {result.output}"
+
+                # check -h option
+                result = runner.invoke(show.cli.commands["system-health"].commands["dpu"], ["-h"])
+                print(result.output)
+
+    def test_health_dpu_non_smartswitch(self):
+        # Mock is_smartswitch to return True
+        with mock.patch("sonic_py_common.device_info.is_smartswitch", return_value=False):
+
+            # Check if 'dpu' command is available under system-health
+            available_commands = show.cli.commands["system-health"].commands
+            assert "dpu" in available_commands, f"'dpu' command not found: {available_commands}"
+
+            conn = dbconnector.SonicV2Connector()
+            conn.connect(conn.CHASSIS_STATE_DB)
+            conn.set(conn.CHASSIS_STATE_DB, 'DPU_STATE|DPU0', "id", "0")
+            conn.set(conn.CHASSIS_STATE_DB, 'DPU_STATE|DPU0', "dpu_midplane_link_reason", "OK")
+            conn.set(conn.CHASSIS_STATE_DB, 'DPU_STATE|DPU0', "dpu_midplane_link_state", "UP")
+            conn.set(conn.CHASSIS_STATE_DB, 'DPU_STATE|DPU0', "dpu_data_plane_time", "20240607 15:08:51")
+            conn.set(conn.CHASSIS_STATE_DB, 'DPU_STATE|DPU0', "dpu_control_plane_time", "20240608 09:11:13")
+            conn.set(conn.CHASSIS_STATE_DB, 'DPU_STATE|DPU0', "dpu_data_plane_state", "UP")
+            conn.set(conn.CHASSIS_STATE_DB, 'DPU_STATE|DPU0', "dpu_control_plane_reason", "Uplink is UP")
+            conn.set(conn.CHASSIS_STATE_DB, 'DPU_STATE|DPU0', "dpu_control_plane_state", "UP")
+            conn.set(conn.CHASSIS_STATE_DB, 'DPU_STATE|DPU0', "dpu_data_plane_reason", "Polaris is UP")
+            conn.set(conn.CHASSIS_STATE_DB, 'DPU_STATE|DPU0', "dpu_midplane_link_time", "20240608 09:11:13")
+
+            with mock.patch("show.system_health.SonicV2Connector", return_value=conn):
+                runner = CliRunner()
+                result = runner.invoke(show.cli.commands["system-health"].commands["dpu"], ["DPU0"])
+
+                # Assert the output and exit code
+                assert result.exit_code == 0, f"Expected exit code 0, got {result.exit_code}. Output: {result.output}"
+                assert "DPU0" not in result.output, f"Output contained DPU0: {result.output}"
+
+    # Test 'get_all_dpu_options' function
+    def test_get_all_dpu_options(self):
+        # Mock is_smartswitch to return True
+        with mock.patch("sonic_py_common.device_info.is_smartswitch", return_value=True):
+
+            # Mock platform info to simulate a valid platform returned from get_platform_info
+            mock_platform_info = {'platform': 'mock_platform'}
+            with mock.patch("sonic_py_common.device_info.get_platform_info", return_value=mock_platform_info):
+
+                # Mock open to simulate reading a platform.json file
+                mock_platform_data = '{"DPUS": {"dpu0": {}, "dpu1": {}}}'
+                with mock.patch("builtins.open", mock.mock_open(read_data=mock_platform_data)):
+
+                    # Mock json.load to return parsed JSON content from the mocked file
+                    with mock.patch("json.load", return_value=json.loads(mock_platform_data)):
+
+                        # Import the actual get_all_dpu_options function and invoke it
+                        from show.system_health import get_all_dpu_options
+                        dpu_list = get_all_dpu_options()
+                        print(dpu_list)
+
     @classmethod
     def teardown_class(cls):
         print("TEARDOWN")
         os.environ["PATH"] = os.pathsep.join(os.environ["PATH"].split(os.pathsep)[:-1])
         os.environ["UTILITIES_UNIT_TESTING"] = "0"
-
+        show.cli = original_cli
diff --git a/utilities_common/chassis.py b/utilities_common/chassis.py
index 1283bca580..63adcd988e 100644
--- a/utilities_common/chassis.py
+++ b/utilities_common/chassis.py
@@ -16,3 +16,26 @@ def get_chassis_local_interfaces():
                 lst = data[1].split(",")
                 return lst
     return lst
+
+
+def is_smartswitch():
+    return hasattr(device_info, 'is_smartswitch') and device_info.is_smartswitch()
+
+
+# utility to get dpu module name list
+def get_all_dpus():
+    try:
+        # Convert the entries in the list to uppercase
+        return [dpu.upper() for dpu in device_info.get_dpu_list()]
+    except Exception:
+        return []
+
+
+# utility to get dpu module name list and all
+def get_all_dpu_options():
+    dpu_list = get_all_dpus()
+
+    # Add 'all' to the list
+    dpu_list += ['all']
+
+    return dpu_list