Skip to content

QoS template files were not being applied on the Xsight ES9618xx device. #108

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
yehjunying merged 1 commit into from
Aug 4, 2025
Merged

QoS template files were not being applied on the Xsight ES9618xx device. #108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 19 additions & 15 deletions config/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,15 +264,17 @@ def breakout_Ports(cm, delPorts=list(), portJson=dict(), force=False, \
raise click.Abort()
return

def get_sai_version():
command = "docker exec syncd dpkg -l | grep libsaibcm | awk '{print $3}'"
proc = subprocess.Popen(command, shell=True, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = proc.communicate()

if proc.returncode != 0 or not stdout:
return ""
def is_community_brcm_sai():
# The Broadcom SAI package name can be determined from the installed image
# directory (/host/image-<image-version>), if it exists.
command = "find /host/image-`docker images | grep syncd-brcm | grep -v latest | awk '{print $2}'` -name \"*libsaibcm*\" | grep -e \"libsaibcm$\""
proc = subprocess.Popen(command, shell=True)
proc.communicate()

if proc.returncode != 0:
return False

return stdout.strip()
return True

#
# Helper functions
Expand Down Expand Up @@ -3245,20 +3247,22 @@ def reload(ctx, no_dynamic_buffer, no_delay, dry_run, json_data, ports, verbose)
)

#
# 2.0.0+6532+20250429-233 is ecSAI version.
# Only applying lossless buffer configuration on ecSAI platform.
# Skip applying buffer/QoS configuration on community Broadcom SAI.
#
if os.path.isfile(qos_template_file) and get_sai_version().startswith("2.0.0"):
if not os.path.isfile(qos_template_file):
click.secho("QoS definition template not found at {}".format(
qos_template_file
), fg="yellow")
elif is_community_brcm_sai():
click.secho("The current platform does not support the provided buffer/QoS configuration.",
fg="yellow")
else:
cmd_ns = [] if ns is DEFAULT_NAMESPACE else ['-n', str(ns)]
fname = "{}{}".format(dry_run, asic_id_suffix) if dry_run else "config-db"
command = [SONIC_CFGGEN_PATH] + cmd_ns + from_db + ['-t', '{},{}'.format(buffer_template_file, fname), '-t', '{},{}'.format(qos_template_file, fname), '-y', sonic_version_file]
# Apply the configurations only when both buffer and qos
# configuration files are present
clicommon.run_command(command, display_cmd=True)
else:
click.secho("QoS definition template not found at {}".format(
qos_template_file
), fg="yellow")
else:
click.secho("Buffer definition template not found at {}".format(
buffer_template_file
Expand Down