feat: support namespace arg for show mac

Author: cyw233

doc/Command-Reference.md

@@ -11827,12 +11827,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:
@@ -11931,6 +11932,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

@@ -56,17 +56,24 @@ try: # pragma: no cover
 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 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)
@@ -169,7 +176,7 @@ class FdbShow(object):
 
         print("Total number of entries {0}".format(len(self.bridge_mac_list)))
 
-    def validate_params(self, vlan, port, address, entry_type):
+    def validate_params(self, vlan, port, address, entry_type, namespace):
         if vlan is not None:
             if not vlan.isnumeric():
                 print("Error: Invalid vlan id {0}".format(vlan))
@@ -194,6 +201,15 @@ class FdbShow(object):
             print("Error: Invalid type {0}". format(entry_type))
             return False
 
+        if namespace is not None:
+            if not multi_asic.is_multi_asic():
+                print("Error: Namespace is not supported in single asic")
+                return False
+
+            if namespace not in multi_asic.get_namespace_list():
+                print("Error: Invalid namespace {0}".format(namespace))
+                return False
+
         return True
 
 def main():
@@ -205,11 +221,12 @@ 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()
-        if not fdb.validate_params(args.vlan, args.port, args.address, args.type):
+        fdb = FdbShow(namespace=args.namespace)
+        if not fdb.validate_params(args.vlan, args.port, args.address, args.type, args.namespace):
            sys.exit(1)
 
         fdb.display(args.vlan, args.port, args.address, args.type, args.count)

show/main.py

@@ -1121,7 +1121,8 @@ def pwm_headroom_pool(namespace):
 @click.option('-t', '--type')
 @click.option('-c', '--count', is_flag=True)
 @click.option('--verbose', is_flag=True, help="Enable verbose output")
-def mac(ctx, vlan, port, address, type, count, verbose):
+@multi_asic_util.multi_asic_click_option_namespace
+def mac(ctx, vlan, port, address, type, count, verbose, namespace):
     """Show MAC (FDB) entries"""
 
     if ctx.invoked_subcommand is not None:
@@ -1144,6 +1145,9 @@ def mac(ctx, vlan, port, address, type, count, verbose):
     if count:
         cmd += ["-c"]
 
+    if namespace is not None:
+        cmd += ['-n', str(namespace)]
+
     run_command(cmd, display_cmd=verbose)
 
 @mac.command('aging-time')