Merge branch 'master' into icmpshow

Author: manamand2020

.gitignore

@@ -15,6 +15,10 @@ dist/
 coverage.xml
 htmlcov/
 
+# Dev tools
+.vscode/
+.idea/
+
 # Ignores for sonic-utilities-data
 sonic-utilities-data/debian/*
 !sonic-utilities-data/debian/changelog

azure-pipelines.yml

@@ -40,7 +40,7 @@ stages:
       DIFF_COVER_CHECK_THRESHOLD: 80
       DIFF_COVER_ENABLE: 'true'
     pool:
-      vmImage: ubuntu-20.04
+      vmImage: ubuntu-24.04
 
     container:
       image: sonicdev-microsoft.azurecr.io:443/sonic-slave-bookworm:$(BUILD_BRANCH)

config/muxcable.py

@@ -277,14 +277,52 @@ def lookup_statedb_and_update_configdb(db, per_npu_statedb, config_db, port, sta
             port_status_dict[port_name] = 'OK'
 
 def update_configdb_pck_loss_data(config_db, port, val):
+    fvs = {}
     configdb_state = get_value_for_key_in_config_tbl(config_db, port, "state", "MUX_CABLE")
+    fvs["state"] = configdb_state
     ipv4_value = get_value_for_key_in_config_tbl(config_db, port, "server_ipv4", "MUX_CABLE")
+    fvs["server_ipv4"] = ipv4_value
     ipv6_value = get_value_for_key_in_config_tbl(config_db, port, "server_ipv6", "MUX_CABLE")
+    fvs["server_ipv6"] = ipv6_value
+    soc_ipv4_value = get_optional_value_for_key_in_config_tbl(config_db, port, "soc_ipv4", "MUX_CABLE")
+    if soc_ipv4_value is not None:
+        fvs["soc_ipv4"] = soc_ipv4_value
+    cable_type = get_optional_value_for_key_in_config_tbl(config_db, port, "cable_type", "MUX_CABLE")
+    if cable_type is not None:
+        fvs["cable_type"] = cable_type
+    prober_type_val = get_optional_value_for_key_in_config_tbl(config_db, port, "prober_type", "MUX_CABLE")
+    if prober_type_val is not None:
+        fvs["prober_type"] = prober_type_val
 
+    fvs["pck_loss_data_reset"] = val
     try:
-        config_db.set_entry("MUX_CABLE", port, {"state": configdb_state,
-                                                "server_ipv4": ipv4_value, "server_ipv6": ipv6_value, 
-                                                "pck_loss_data_reset": val})
+        config_db.set_entry("MUX_CABLE", port, fvs)
+    except ValueError as e:
+        ctx = click.get_current_context()
+        ctx.fail("Invalid ConfigDB. Error: {}".format(e))
+
+
+def update_configdb_prober_type(config_db, port, val):
+    fvs = {}
+    configdb_state = get_value_for_key_in_config_tbl(config_db, port, "state", "MUX_CABLE")
+    fvs["state"] = configdb_state
+    ipv4_value = get_value_for_key_in_config_tbl(config_db, port, "server_ipv4", "MUX_CABLE")
+    fvs["server_ipv4"] = ipv4_value
+    ipv6_value = get_value_for_key_in_config_tbl(config_db, port, "server_ipv6", "MUX_CABLE")
+    fvs["server_ipv6"] = ipv6_value
+    soc_ipv4_value = get_optional_value_for_key_in_config_tbl(config_db, port, "soc_ipv4", "MUX_CABLE")
+    if soc_ipv4_value is not None:
+        fvs["soc_ipv4"] = soc_ipv4_value
+    cable_type = get_optional_value_for_key_in_config_tbl(config_db, port, "cable_type", "MUX_CABLE")
+    if cable_type is not None:
+        fvs["cable_type"] = cable_type
+    pck_loss_data = get_optional_value_for_key_in_config_tbl(config_db, port, "pck_loss_data_reset", "MUX_CABLE")
+    if pck_loss_data is not None:
+        fvs["pck_loss_data_reset"] = pck_loss_data
+
+    fvs["prober_type"] = val
+    try:
+        config_db.set_entry("MUX_CABLE", port, fvs)
     except ValueError as e:
         ctx = click.get_current_context()
         ctx.fail("Invalid ConfigDB. Error: {}".format(e))
@@ -381,6 +419,73 @@ def mode(db, state, port, json_output):
         sys.exit(CONFIG_SUCCESSFUL)
 
 
+# 'muxcable' command ("config muxcable probertype hardware/software <port|all>")
+@muxcable.command()
+@click.argument('probertype', metavar='<operation_status>', required=True, type=click.Choice(["hardware", "software"]))
+@click.argument('port', metavar='<port_name>', required=True, default=None)
+@clicommon.pass_db
+def probertype(db, probertype, port):
+    """Config muxcable probertype"""
+
+    port = platform_sfputil_helper.get_interface_name(port, db)
+
+    port_table_keys = {}
+    y_cable_asic_table_keys = {}
+    per_npu_configdb = {}
+    per_npu_statedb = {}
+
+    # Getting all front asic namespace and correspding config and state DB connector
+
+    namespaces = multi_asic.get_front_end_namespaces()
+    for namespace in namespaces:
+        asic_id = multi_asic.get_asic_index_from_namespace(namespace)
+        # replace these with correct macros
+        per_npu_configdb[asic_id] = ConfigDBConnector(use_unix_socket_path=True, namespace=namespace)
+        per_npu_configdb[asic_id].connect()
+        per_npu_statedb[asic_id] = SonicV2Connector(use_unix_socket_path=True, namespace=namespace)
+        per_npu_statedb[asic_id].connect(per_npu_statedb[asic_id].STATE_DB)
+
+        port_table_keys[asic_id] = per_npu_statedb[asic_id].keys(
+            per_npu_statedb[asic_id].STATE_DB, 'MUX_CABLE_TABLE|*')
+
+    if port is not None and port != "all":
+
+        asic_index = None
+        if platform_sfputil is not None:
+            asic_index = platform_sfputil.get_asic_id_for_logical_port(port)
+        if asic_index is None:
+            # TODO this import is only for unit test purposes, and should be removed once sonic_platform_base
+            # is fully mocked
+            import sonic_platform_base.sonic_sfp.sfputilhelper
+            asic_index = sonic_platform_base.sonic_sfp.sfputilhelper.SfpUtilHelper().get_asic_id_for_logical_port(port)
+            if asic_index is None:
+                click.echo("Got invalid asic index for port {}, cant retreive mux status".format(port))
+                sys.exit(CONFIG_FAIL)
+
+        if per_npu_statedb[asic_index] is not None:
+            y_cable_asic_table_keys = port_table_keys[asic_index]
+            logical_key = "MUX_CABLE_TABLE|{}".format(port)
+            if logical_key in y_cable_asic_table_keys:
+                update_configdb_prober_type(per_npu_configdb[asic_index], port, probertype)
+                sys.exit(CONFIG_SUCCESSFUL)
+            else:
+                click.echo("this is not a valid port {} present on mux_cable".format(port))
+                sys.exit(CONFIG_FAIL)
+        else:
+            click.echo("there is not a valid asic asic-{} table for this asic_index".format(asic_index))
+            sys.exit(CONFIG_FAIL)
+
+    elif port == "all" and port is not None:
+
+        for namespace in namespaces:
+            asic_id = multi_asic.get_asic_index_from_namespace(namespace)
+            for key in port_table_keys[asic_id]:
+                logical_port = key.split("|")[1]
+                update_configdb_prober_type(per_npu_configdb[asic_id], logical_port, probertype)
+
+        sys.exit(CONFIG_SUCCESSFUL)
+
+
 # 'muxcable' command ("config muxcable kill-radv <enable|disable> ")
 @muxcable.command(short_help="Kill radv service when it is meant to be stopped, so no good-bye packet is sent for ceasing To Be an Advertising Interface")
 @click.argument('knob', metavar='<feature_knob>', required=True, type=click.Choice(["enable", "disable"]))
@@ -396,8 +501,7 @@ def kill_radv(db, knob):
         mux_lmgrd_cfg_tbl = config_db.get_table("MUX_LINKMGR")
         config_db.mod_entry("MUX_LINKMGR", "SERVICE_MGMT", {"kill_radv": "True" if knob == "enable" else "False"})
 
-
- #'muxcable' command ("config muxcable packetloss reset <port|all>")
+# 'muxcable' command ("config muxcable packetloss reset <port|all>")
 @muxcable.command()
 @click.argument('action', metavar='<action_name>', required=True, type=click.Choice(["reset"]))
 @click.argument('port', metavar='<port_name>', required=True, default=None)

doc/Command-Reference.md

@@ -2337,7 +2337,7 @@ This command displays the state and key parameters of all BFD sessions.
 
 - Usage:
   ```
-  show bfd summary
+  show bfd summary [-n <namespace>]
   ```
 - Example:
   ```
@@ -2356,7 +2356,7 @@ This command displays the state and key parameters of all BFD sessions that matc
 
 - Usage:
   ```
-  show bfd peer <peer-ip>
+  show bfd peer <peer-ip> [-n <namespace>]
   ```
 - Example:
   ```
@@ -12004,12 +12004,13 @@ This command displays the MAC (FDB) entries either in full or partial as given b
 4) show mac -a <mac-address> - display the MACs that match a specific mac-address
 5) show mac -t <type> - display the MACs that match a specific type (static/dynamic)
 6) show mac -c - display the count of MAC addresses
+7) show mac -n <namespace> - display the MACs that belong to a specific namespace
 
 To show the default MAC address aging time on the switch.
 
 - Usage:
   ```
-  show mac [-v <vlan_id>] [-p <port_name>] [-a <mac_address>] [-t <type>] [-c]
+  show mac [-v <vlan_id>] [-p <port_name>] [-a <mac_address>] [-t <type>] [-c] [-n <namespace>]
   ```
 
 - Example:
@@ -12108,6 +12109,14 @@ Optionally, you can specify a VLAN ID or interface name or type or mac-address i
   admin@sonic:~$ show mac -c
   Total number of entries 18
   ```
+  ```
+  admin@sonic:~$ show mac -n asic0
+  No.    Vlan  MacAddress         Port           Type
+  -----  ------  -----------------  -----------  -------
+    2    1000  50:96:23:AD:F1:65  Ethernet192    Static
+    2    1000  C6:C9:5E:AE:24:42  Ethernet192    Static
+  Total number of entries 2
+  ```
 
 **show mac aging-time**
 

scripts/fdbshow

@@ -32,14 +32,18 @@ import sys
 import os
 import re
 
+from utilities_common.general import load_db_config
+
 # mock the redis for unit test purposes #
 try: # pragma: no cover
-    if os.environ["UTILITIES_UNIT_TESTING"] == "1": 
+    if os.environ["UTILITIES_UNIT_TESTING"] == "1":
         modules_path = os.path.join(os.path.dirname(__file__), "..")
         test_path = os.path.join(modules_path, "tests")
         sys.path.insert(0, modules_path)
         sys.path.insert(0, test_path)
-        import mock_tables.dbconnector
+        from tests.mock_tables import dbconnector
+
+    if os.environ["FDBSHOW_UNIT_TESTING"] == "1":
         mock_variants = { "1": 'asic_db',
                           "2": 'asic_db_def_vlan',
                           "3": 'asic_db_no_fdb',
@@ -50,23 +54,38 @@ try: # pragma: no cover
         mock_db_path = os.path.join(test_path, "fdbshow_input")
         file_name = mock_variants[os.environ["FDBSHOW_MOCK"]]
         jsonfile_asic = os.path.join(mock_db_path, file_name)
-        mock_tables.dbconnector.dedicated_dbs['ASIC_DB'] = jsonfile_asic
+        dbconnector.dedicated_dbs['ASIC_DB'] = jsonfile_asic
         jsonfile_counters = os.path.join(mock_db_path, 'counters_db')
-        mock_tables.dbconnector.dedicated_dbs['COUNTERS_DB'] = jsonfile_counters
+        dbconnector.dedicated_dbs['COUNTERS_DB'] = jsonfile_counters
+
+    if os.environ["UTILITIES_UNIT_TESTING_TOPOLOGY"] == "multi_asic":
+        import tests.mock_tables.mock_multi_asic
+        dbconnector.load_namespace_config()
 except KeyError: # pragma: no cover
     pass
 
-from sonic_py_common import port_util
-from swsscommon.swsscommon import SonicV2Connector
+from sonic_py_common import port_util, multi_asic
+from swsscommon.swsscommon import SonicV2Connector, SonicDBConfig
 from tabulate import tabulate
 
 class FdbShow(object):
 
     HEADER = ['No.', 'Vlan', 'MacAddress', 'Port', 'Type']
 
-    def __init__(self):
+    def __init__(self, namespace=None):
         super(FdbShow,self).__init__()
-        self.db = SonicV2Connector(host="127.0.0.1")
+        if namespace is not None:
+            if not multi_asic.is_multi_asic():
+                print("Error: Namespace is not supported in single asic")
+                sys.exit(1)
+
+            if not SonicDBConfig.isGlobalInit():
+                SonicDBConfig.load_sonic_global_db_config()
+
+            self.db = SonicV2Connector(use_unix_socket_path=True, namespace=namespace)
+        else:
+            self.db = SonicV2Connector(host="127.0.0.1")
+
         self.if_name_map, \
         self.if_oid_map = port_util.get_interface_oid_map(self.db)
         self.if_br_oid_map = port_util.get_bridge_port_map(self.db)
@@ -205,10 +224,11 @@ def main():
     parser.add_argument('-a', '--address', type=str, help='FDB display based on specific mac address', default=None)
     parser.add_argument('-t', '--type', type=str, help='FDB display of specific type of mac address', default=None)
     parser.add_argument('-c', '--count', action='store_true', help='FDB display count of mac address')
+    parser.add_argument('-n', '--namespace', type=str, help='Namespace name or all', default=None)
     args = parser.parse_args()
 
     try:
-        fdb = FdbShow()
+        fdb = FdbShow(namespace=args.namespace)
         if not fdb.validate_params(args.vlan, args.port, args.address, args.type):
            sys.exit(1)
 

scripts/reboot

@@ -77,7 +77,7 @@ function stop_pmon_service()
      fi
      systemctl stop pmon || debug "Ignore stopping pmon error $?"
      docker kill pmon &> /dev/null || CONTAINER_STOP_RC=$?
-     if [[ CONTAINER_STOP_RC -ne 0 ]]; then
+     if [[ $CONTAINER_STOP_RC -ne 0 ]]; then
         debug "Failed killing container pmon RC $CONTAINER_STOP_RC ."
      fi
 }
@@ -315,7 +315,7 @@ if [ -x ${WATCHDOG_UTIL} ]; then
 fi
 
 if [[ "${PRE_SHUTDOWN}" == "yes" ]]; then
-    echo "${DPU_MODULE_NAME} pre-shutdown steps are completed"
+    debug "${DPU_MODULE_NAME} pre-shutdown steps are completed"
     exit ${EXIT_SUCCESS}
 fi
 

scripts/reboot_smartswitch_helper

@@ -49,13 +49,17 @@ function get_reboot_status()
 {
     local dpu_ip=$1
     local port=$2
-    $(docker exec gnmi gnoi_client -target "${dpu_ip}:${port}" -logtostderr -notls -module System -rpc RebootStatus &>/dev/null)
+    local reboot_output_file="reboot_status.txt"
+
+    $(docker exec gnmi gnoi_client -target "${dpu_ip}:${port}" -logtostderr -notls -module System -rpc RebootStatus | tee "$reboot_output_file" &>/dev/null)
     if [ $? -ne 0 ]; then
+        rm -f "$reboot_output_file"
         return ${EXIT_ERROR}
     fi
     local is_reboot_active
-    is_reboot_active=$(echo "$reboot_status" | grep "active" | awk '{print $2}')
-    if [ "$is_reboot_active" == "false" ]; then
+    is_reboot_active=$(cat "$reboot_output_file" | awk '/^{.*}$/' | jq -r '.active')
+    rm -f "$reboot_output_file"
+    if [ "$is_reboot_active" != "true" ]; then
         return ${EXIT_SUCCESS}
     fi
     return ${EXIT_ERROR}