Skip to content

Fix multi-asic behaviour for mmuconfig #3061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 5, 2024
Merged

Fix multi-asic behaviour for mmuconfig #3061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86c8b1a
Fixes multi-asic behaviour for mmuconfig
bktsim-arista Nov 2, 2023
c7b239e
Fixes for linter
rdjeric-arista May 15, 2024
5516dbf
More linter fixes
rdjeric-arista May 15, 2024
febac77
Enhanced multi-asic support for mmuconfig
arista-hpandya Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions config/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6425,13 +6425,26 @@ def ecn(profile, rmax, rmin, ymax, ymin, gmax, gmin, rdrop, ydrop, gdrop, verbos
@config.command()
@click.option('-p', metavar='<profile_name>', type=str, required=True, help="Profile name")
@click.option('-a', metavar='<alpha>', type=click.IntRange(-8,8), help="Set alpha for profile type dynamic")
@click.option('-s', metavar='<staticth>', type=int, help="Set staticth for profile type static")
def mmu(p, a, s):
@click.option('-s', metavar='<staticth>', type=click.IntRange(min=0), help="Set staticth for profile type static")
@click.option('--verbose', '-vv', is_flag=True, help="Enable verbose output")
@click.option('--namespace',
'-n',
'namespace',
default=None,
type=str,
show_default=True,
help='Namespace name or all',
callback=multi_asic_util.multi_asic_namespace_validation_callback)
def mmu(p, a, s, namespace, verbose):
"""mmuconfig configuration tasks"""
log.log_info("'mmuconfig -p {}' executing...".format(p))
command = ['mmuconfig', '-p', str(p)]
if a is not None: command += ['-a', str(a)]
if s is not None: command += ['-s', str(s)]
if namespace is not None:
command += ['-n', str(namespace)]
if verbose:
command += ['-vv']
clicommon.run_command(command)


Expand Down
128 changes: 64 additions & 64 deletions scripts/mmuconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,23 @@ optional arguments:

import os
import sys
import argparse
import click
import tabulate
import traceback
import json
from utilities_common.general import load_db_config
from sonic_py_common import multi_asic
from utilities_common import multi_asic as multi_asic_util

BUFFER_POOL_TABLE_NAME = "BUFFER_POOL"
BUFFER_PROFILE_TABLE_NAME = "BUFFER_PROFILE"
DEFAULT_LOSSLESS_BUFFER_PARAMETER_NAME = "DEFAULT_LOSSLESS_BUFFER_PARAMETER"

DYNAMIC_THRESHOLD = "dynamic_th"
DYNAMIC_THRESHOLD_MIN = -8
DYNAMIC_THRESHOLD_MAX = 8
STATIC_THRESHOLD = "static_th"
STATIC_THRESHOLD_MIN = 0
BUFFER_PROFILE_FIELDS = {
"alpha": DYNAMIC_THRESHOLD,
"staticth" : STATIC_THRESHOLD
Expand All @@ -42,29 +48,33 @@ 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()
else:
mock_tables.dbconnector.load_database_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.multi_asic = multi_asic_util.MultiAsic(namespace_option=namespace)
self.config_db = None
self.db = None

# Set up db connections
if self.config:
self.db = ConfigDBConnector()
self.db.connect()
else:
self.db = SonicV2Connector(use_unix_socket_path=False)
self.db.connect(self.db.STATE_DB, False)
# For unit testing
self.updated_profile_table = {}

def get_table(self, tablename):
if self.config:
return self.db.get_table(tablename)
return self.config_db.get_table(tablename)

entries = {}
keys = self.db.keys(self.db.STATE_DB, tablename + '*')
Expand All @@ -77,13 +87,15 @@ class MmuConfig(object):

return entries

@multi_asic_util.run_on_multi_asic
def list(self):
namespace_str = f" for namespace {self.multi_asic.current_namespace}" if multi_asic.is_multi_asic() else ''
lossless_traffic_pattern = self.get_table(DEFAULT_LOSSLESS_BUFFER_PARAMETER_NAME)
if lossless_traffic_pattern:
for _, pattern in lossless_traffic_pattern.items():
config = []

print("Lossless traffic pattern:")
print(f"Lossless traffic pattern{namespace_str}:")
for field, value in pattern.items():
config.append([field, value])
print(tabulate.tabulate(config) + "\n")
Expand All @@ -93,97 +105,88 @@ class MmuConfig(object):
for pool_name, pool_data in buf_pools.items():
config = []

print("Pool: " + pool_name)
print(f"Pool{namespace_str}: " + pool_name)
for field, value in pool_data.items():
config.append([field, value])
print(tabulate.tabulate(config) + "\n")
if self.verbose:
print("Total pools: %d\n\n" % len(buf_pools))
else:
print("No buffer pool information available")
print(f"No buffer pool information available{namespace_str}")

buf_profs = self.get_table(BUFFER_PROFILE_TABLE_NAME)
if buf_profs:
for prof_name, prof_data in buf_profs.items():
config = []

print("Profile: " + prof_name)
print(f"Profile{namespace_str}: " + prof_name)
for field, value in prof_data.items():
config.append([field, value])
print(tabulate.tabulate(config) + "\n")
if self.verbose:
print("Total profiles: %d" % len(buf_profs))
else:
print("No buffer profile information available")
print(f"No buffer profile information available{namespace_str}")

@multi_asic_util.run_on_multi_asic
def set(self, profile, field_alias, value):
namespace_str = f" for namespace {self.multi_asic.current_namespace}" if multi_asic.is_multi_asic() else ''
if os.geteuid() != 0 and os.environ.get("UTILITIES_UNIT_TESTING", "0") != "2":
sys.exit("Root privileges required for this operation")

field = BUFFER_PROFILE_FIELDS[field_alias]
buf_profs = self.db.get_table(BUFFER_PROFILE_TABLE_NAME)
v = int(value)
buf_profs = self.config_db.get_table(BUFFER_PROFILE_TABLE_NAME)
if field == DYNAMIC_THRESHOLD:
if v < -8 or v > 8:
sys.exit("Invalid alpha value: 2^(%s)" % (value))

if profile in buf_profs and DYNAMIC_THRESHOLD not in buf_profs[profile]:
sys.exit("%s not using dynamic thresholding" % (profile))
elif field == STATIC_THRESHOLD:
if v < 0:
sys.exit("Invalid static threshold value: (%s)" % (value))

if profile in buf_profs and STATIC_THRESHOLD not in buf_profs[profile]:
sys.exit("%s not using static threshold" % (profile))
else:
sys.exit("Set field %s not supported" % (field))

if self.verbose:
print("Setting %s %s value to %s" % (profile, field, value))
self.db.mod_entry(BUFFER_PROFILE_TABLE_NAME, profile, {field: value})
print("Setting %s %s value to %s%s" % (profile, field, value, namespace_str))
self.config_db.mod_entry(BUFFER_PROFILE_TABLE_NAME, profile, {field: value})
if self.filename is not None:
prof_table = self.db.get_table(BUFFER_PROFILE_TABLE_NAME)
self.updated_profile_table[self.multi_asic.current_namespace] = self.config_db.get_table(BUFFER_PROFILE_TABLE_NAME)
with open(self.filename, "w") as fd:
json.dump(prof_table, fd)


def main(config):
if config:
parser = argparse.ArgumentParser(description='Show and change: mmu configuration',
formatter_class=argparse.RawTextHelpFormatter)

parser.add_argument('-l', '--list', action='store_true', help='show mmu configuration')
parser.add_argument('-p', '--profile', type=str, help='specify buffer profile name', default=None)
parser.add_argument('-a', '--alpha', type=str, help='set n for dyanmic threshold alpha 2^(n)', default=None)
parser.add_argument('-s', '--staticth', type=str, help='set static threshold', default=None)
parser.add_argument('-v', '--version', action='version', version='%(prog)s 1.0')
else:
parser = argparse.ArgumentParser(description='Show buffer state',
formatter_class=argparse.RawTextHelpFormatter)

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('-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)

json.dump(self.updated_profile_table, fd)

@click.command(help='Show and change: mmu configuration')
@click.option('-l', '--list', 'show_config', is_flag=True, help='show mmu configuration')
@click.option('-p', '--profile', type=str, help='specify buffer profile name', default=None)
@click.option('-a', '--alpha', type=click.IntRange(DYNAMIC_THRESHOLD_MIN, DYNAMIC_THRESHOLD_MAX), help='set n for dyanmic threshold alpha 2^(n)', default=None)
@click.option('-s', '--staticth', type=click.IntRange(min=STATIC_THRESHOLD_MIN), help='set static threshold', default=None)
@click.option('-n', '--namespace', type=click.Choice(multi_asic.get_namespace_list()), help='Namespace name or skip for all', default=None)
@click.option('-vv', '--verbose', is_flag=True, help='verbose output', default=False)
@click.version_option(version='1.0')
def main(show_config, profile, alpha, staticth, namespace, verbose):
# A test file created for unit test purposes
filename=None
if os.environ.get("UTILITIES_UNIT_TESTING", "0") == "2":
sys.argv.extend(['-f', '/tmp/mmuconfig'])
filename = '/tmp/mmuconfig'


args = parser.parse_args()
# Buffershow and mmuconfig cmds share this script
# Buffershow cmd cannot modify configs hence config is set to False
config = True if sys.argv[0].split('/')[-1] == "mmuconfig" else False

try:
mmu_cfg = MmuConfig(args.verbose, config, args.filename)
if args.list:
load_db_config()
mmu_cfg = MmuConfig(verbose, config, filename, namespace)

# Both mmuconfig and buffershow have access to show_config option
if show_config:
mmu_cfg.list()
elif config and args.profile:
if args.alpha:
mmu_cfg.set(args.profile, "alpha", args.alpha)
elif args.staticth:
mmu_cfg.set(args.profile, "staticth", args.staticth)
# Buffershow cannot modify profiles
elif config and profile:
if alpha:
mmu_cfg.set(profile, "alpha", alpha)
elif staticth:
mmu_cfg.set(profile, "staticth", staticth)
else:
parser.print_help()
ctx = click.get_current_context()
click.echo(ctx.get_help())
sys.exit(1)

except Exception as e:
Expand All @@ -192,7 +195,4 @@ def main(config):
sys.exit(1)

if __name__ == "__main__":
if sys.argv[0].split('/')[-1] == "mmuconfig":
main(True)
else:
main(False)
main()
33 changes: 30 additions & 3 deletions show/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,6 @@ def cli(ctx):
load_db_config()
ctx.obj = Db()


# Add groups from other modules
cli.add_command(acl.acl)
cli.add_command(chassis_modules.chassis)
Expand Down Expand Up @@ -2033,9 +2032,22 @@ def boot():
# 'mmu' command ("show mmu")
#
@cli.command('mmu')
def mmu():
@click.option('--namespace',
'-n',
'namespace',
default=None,
type=str,
show_default=True,
help='Namespace name or all',
callback=multi_asic_util.multi_asic_namespace_validation_callback)
@click.option('--verbose', '-vv', is_flag=True, help="Enable verbose output")
def mmu(namespace, verbose):
"""Show mmu configuration"""
cmd = ['mmuconfig', '-l']
if namespace is not None:
cmd += ['-n', str(namespace)]
if verbose:
cmd += ['-vv']
run_command(cmd)

#
Expand All @@ -2049,10 +2061,25 @@ def buffer():
#
# 'configuration' command ("show buffer command")
#


@buffer.command()
def configuration():
@click.option('--namespace',
'-n',
'namespace',
default=None,
type=str,
show_default=True,
help='Namespace name or all',
callback=multi_asic_util.multi_asic_namespace_validation_callback)
@click.option('--verbose', '-vv', is_flag=True, help="Enable verbose output")
def configuration(namespace, verbose):
"""show buffer configuration"""
cmd = ['mmuconfig', '-l']
if namespace is not None:
cmd += ['-n', str(namespace)]
if verbose:
cmd += ['-vv']
run_command(cmd)

#
Expand Down
Loading
Loading