Fixes multi-asic behaviour for mmuconfig

Previously, mmuconfig did not function correctly on multi-asic
devices as it did not traverse through the correct namespaces, as required
for multi-asic devices. This change adds multi-asic support to mmuconfig with
the use of multi-asic helper libraries, ensuring that mmuconfig searches throuugh
the correct namespaces when used on multi-asic devices, and adds the '-n' optional
argument for users to specify namespaces on multi-asic devices.

Author: bktsim-arista

scripts/mmuconfig

@@ -22,6 +22,8 @@ import argparse
 import tabulate
 import traceback
 import json
+from utilities_common.general import load_db_config
+from sonic_py_common import multi_asic
 
 BUFFER_POOL_TABLE_NAME = "BUFFER_POOL"
 BUFFER_PROFILE_TABLE_NAME = "BUFFER_PROFILE"
@@ -42,38 +44,47 @@ try:
         sys.path.insert(0, modules_path)
         sys.path.insert(0, tests_path)
         import mock_tables.dbconnector
-
+    if os.environ["UTILITIES_UNIT_TESTING_TOPOLOGY"] == "multi_asic":
+        import mock_tables.mock_multi_asic
+        mock_tables.dbconnector.load_namespace_config()
 except KeyError:
     pass
 
 from swsscommon.swsscommon import SonicV2Connector, ConfigDBConnector
 
 class MmuConfig(object):
-    def __init__(self, verbose, config, filename):
+    def __init__(self, verbose, config, filename, namespace):
         self.verbose = verbose
         self.config = config
         self.filename = filename
+        self.namespace = namespace
+
+        self.use_unix_socket_path = self.namespace != None
 
         # Set up db connections
         if self.config:
-            self.db = ConfigDBConnector()
+            self.db = ConfigDBConnector(namespace=namespace, use_unix_socket_path=self.use_unix_socket_path)
             self.db.connect()
         else:
-            self.db = SonicV2Connector(use_unix_socket_path=False)
+            self.db = SonicV2Connector(namespace=namespace, use_unix_socket_path=self.use_unix_socket_path)
             self.db.connect(self.db.STATE_DB, False)
 
     def get_table(self, tablename):
         if self.config:
             return self.db.get_table(tablename)
 
         entries = {}
-        keys = self.db.keys(self.db.STATE_DB, tablename + '*')
+        for ns in multi_asic.get_namespace_list(self.namespace):
+            db = SonicV2Connector(namespace=ns, use_unix_socket_path=True)
+            db.connect(db.STATE_DB, False)
+            keys = db.keys(db.STATE_DB, tablename + '*')
 
-        if not keys:
-            return None
+            if keys:
+                for key in keys:
+                    entries[key.split('|')[1]] = db.get_all(db.STATE_DB, key)
 
-        for key in keys:
-            entries[key.split('|')[1]] = self.db.get_all(self.db.STATE_DB, key)
+        if not entries:
+            return None
 
         return entries
 
@@ -120,6 +131,9 @@ class MmuConfig(object):
         if os.geteuid() != 0 and os.environ.get("UTILITIES_UNIT_TESTING", "0") != "2":
             sys.exit("Root privileges required for this operation")
 
+        if not self.namespace and multi_asic.is_multi_asic():
+            sys.exit("Namespace must be specified for this operation")
+
         field = BUFFER_PROFILE_FIELDS[field_alias]
         buf_profs = self.db.get_table(BUFFER_PROFILE_TABLE_NAME)
         v = int(value)
@@ -164,6 +178,7 @@ def main(config):
         parser.add_argument('-l', '--list', action='store_true', help='show buffer state')
         parser.add_argument('-v', '--version', action='version', version='%(prog)s 1.0')
 
+    parser.add_argument('-n', '--namespace', type=str, help='Namespace name', default=None)
     parser.add_argument('-vv', '--verbose', action='store_true', help='verbose output', default=False)
     parser.add_argument('-f', '--filename', help='file used by mock tests', type=str, default=None)
 
@@ -174,7 +189,14 @@ def main(config):
     args = parser.parse_args()
 
     try:
-        mmu_cfg = MmuConfig(args.verbose, config, args.filename)
+        load_db_config()
+        namespaces = multi_asic.get_namespace_list()
+
+        if args.namespace and args.namespace not in namespaces:
+            print("Invalid namespace: Namespace must be one of", *namespaces)
+            sys.exit(1)
+
+        mmu_cfg = MmuConfig(args.verbose, config, args.filename, args.namespace)
         if args.list:
             mmu_cfg.list()
         elif config and args.profile:

tests/mmuconfig_input/mmuconfig_test_vectors.py

@@ -83,6 +83,36 @@
 
 """
 
+show_mmu_config_one = """\
+Pool: ingress_lossy_pool
+----  -------
+mode  dynamic
+type  ingress
+----  -------
+
+Pool: ingress_lossless_pool_hbm
+----  ---------
+mode  static
+size  139458240
+type  ingress
+----  ---------
+
+Profile: ingress_lossy_profile
+----------  ------------------
+dynamic_th  3
+pool        ingress_lossy_pool
+size        0
+----------  ------------------
+
+Profile: ingress_lossless_profile_hbm
+---------  -------------------------
+static_th  12121212
+pool       ingress_lossless_pool_hbm
+size       0
+---------  -------------------------
+
+"""
+
 testData = {
              'mmuconfig_list' : {'cmd' : ['show'],
                                     'args' : [],

tests/mock_tables/asic0/config_db.json

@@ -257,5 +257,24 @@
         "ports@": "Ethernet124",
         "type": "L3",
         "stage": "ingress"
+    },
+    "BUFFER_POOL|ingress_lossy_pool": {
+        "mode": "dynamic",
+        "type": "ingress"
+    },
+    "BUFFER_POOL|ingress_lossless_pool_hbm": {
+        "mode": "static",
+        "size": "139458240",
+         "type": "ingress"
+    },
+    "BUFFER_PROFILE|ingress_lossy_profile": {
+        "dynamic_th": "3",
+        "pool": "ingress_lossy_pool",
+        "size": "0"
+    },
+    "BUFFER_PROFILE|ingress_lossless_profile_hbm": {
+        "static_th": "12121212",
+        "pool": "ingress_lossless_pool_hbm",
+        "size": "0"
     }
 }

tests/mock_tables/asic1/config_db.json

@@ -197,5 +197,40 @@
         "holdtime": "0",
         "asn": "65100",
         "keepalive": "0"
+    },
+    "BUFFER_POOL|ingress_lossless_pool": {
+        "mode": "dynamic",
+        "type": "ingress"
+    },
+    "BUFFER_PROFILE|alpha_profile": {
+        "dynamic_th": "0",
+        "pool": "ingress_lossless_pool",
+        "headroom_type": "dynamic"
+    },
+    "BUFFER_PROFILE|headroom_profile": {
+        "dynamic_th": "0",
+        "pool": "ingress_lossless_pool",
+        "xon": "18432",
+        "xoff": "32768",
+        "size": "51200"
+    },
+    "BUFFER_POOL|egress_lossless_pool": {
+        "mode": "dynamic",
+        "size": "13945824",
+        "type": "egress"
+    },
+    "BUFFER_PROFILE|egress_lossless_profile": {
+        "dynamic_th": "0",
+        "pool": "egress_lossless_pool",
+        "size": "0"
+    },
+    "BUFFER_POOL|egress_lossy_pool": {
+        "mode": "dynamic",
+        "type": "egress"
+    },
+    "BUFFER_PROFILE|egress_lossy_profile": {
+        "dynamic_th": "0",
+        "pool": "egress_lossy_pool",
+        "size": "0"
     }
 }

tests/multi_asic_mmuconfig_test.py

@@ -0,0 +1,49 @@
+import os
+import sys
+
+from utils import get_result_and_return_code
+from mmuconfig_input.mmuconfig_test_vectors import *
+from json import load
+
+root_path = os.path.dirname(os.path.abspath(__file__))
+modules_path = os.path.dirname(root_path)
+scripts_path = os.path.join(modules_path, "scripts")
+sys.path.insert(0, root_path)
+sys.path.insert(0, modules_path)
+
+class TestMmuconfigMultiAsic(object):
+   @classmethod
+   def setup_class(cls):
+      os.environ["PATH"] += os.pathsep + scripts_path
+      os.environ["UTILITIES_UNIT_TESTING_TOPOLOGY"] = "multi_asic"
+      os.environ['UTILITIES_UNIT_TESTING'] = "2"
+      print("SETUP")
+
+   def executor(self, command, expected_result=None):
+      return_code, result = get_result_and_return_code(command)
+      print("return_code: {}".format(return_code))
+      print("result = {}".format(result))
+      assert return_code == 0
+      if expected_result:
+         assert result == expected_result
+
+   def test_mmu_show_config_one_masic(self):
+      self.executor(['mmuconfig', '-l', '-n', 'asic0'], show_mmu_config_one)
+
+   def test_mmu_show_config_all_masic(self):
+      self.executor(['mmuconfig', '-l'], show_mmu_config)
+
+   def test_mmu_alpha_config_masic(self):
+      self.executor(['mmuconfig', '-p', 'alpha_profile', '-a', '2', '-n', 'asic0'])
+      fd = open('/tmp/mmuconfig', 'r')
+      cmp_data = load(fd)
+      assert cmp_data['alpha_profile']['dynamic_th'] == '2'
+
+   @classmethod
+   def teardown_class(cls):
+      os.environ['PATH'] = os.pathsep.join(os.environ['PATH'].split(os.pathsep)[:-1])
+      os.environ['UTILITIES_UNIT_TESTING'] = "0"
+      os.environ["UTILITIES_UNIT_TESTING_TOPOLOGY"] = ""
+      if os.path.isfile('/tmp/mmuconfig'):
+         os.remove('/tmp/mmuconfig')
+      print("TEARDOWN")