Merge branch 'master' into dev-reset-local-users-password

README.md

@@ -51,7 +51,7 @@ A convenient alternative is to let the SONiC build system configure a build envi
 
 2. Build the sonic-utilities Python wheel package inside the Bullseye slave container, and tell the build system to keep the container alive when finished
     ```
-    make NOSTRETCH=1 NOBUSTER=1 KEEP_SLAVE_ON=yes target/python-wheels/bullseye/sonic_utilities-1.2-py3-none-any.whl
+    make -f Makefile.work BLDENV=bookworm KEEP_SLAVE_ON=yes target/python-wheels/bookworm/sonic_utilities-1.2-py3-none-any.whl
     ```
 
 3. When the build finishes, your prompt will change to indicate you are inside the slave container. Change into the `src/sonic-utilities/` directory
@@ -66,13 +66,20 @@ A convenient alternative is to let the SONiC build system configure a build envi
 ```
 python3 setup.py bdist_wheel
 ```
+Note: This command by default will not update the wheel package in target/. To specify the destination location of wheel package, use "-d" option.
 
 #### To run unit tests
 
 ```
 python3 setup.py test
 ```
 
+#### To install the package on a SONiC machine
+```
+sudo pip uninstall sonic-utilities
+sudo pip install YOUR_WHEEL_PACKAGE
+```
+Note: Don't use "--force-reinstall".
 
 ### sonic-utilities-data
 

azure-pipelines.yml

@@ -27,7 +27,7 @@ stages:
     displayName: "Static Analysis"
     timeoutInMinutes: 10
     continueOnError: true
-    pool: ubuntu-20.04
+    pool: sonic-ubuntu-1c
     steps:
     - template: .azure-pipelines/pre-commit-check.yml
 
@@ -46,6 +46,13 @@ stages:
       image: sonicdev-microsoft.azurecr.io:443/sonic-slave-bullseye:$(BUILD_BRANCH)
 
     steps:
+    - script: |
+        set -ex
+        sudo apt-get update
+        sudo apt-get install -y python3-pip
+        sudo pip3 install requests==2.31.0
+      displayName: "Install dependencies"
+
     - script: |
         sourceBranch=$(Build.SourceBranchName)
         if [[ "$(Build.Reason)" == "PullRequest" ]];then
@@ -114,7 +121,7 @@ stages:
         curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
         sudo apt-add-repository https://packages.microsoft.com/debian/11/prod
         sudo apt-get update
-        sudo apt-get install -y dotnet-sdk-5.0
+        sudo apt-get install -y dotnet-sdk-8.0
       displayName: "Install .NET CORE"
 
     - script: |

clear/main.py

@@ -12,7 +12,7 @@
 from show.plugins.pbh import read_pbh_counters
 from config.plugins.pbh import serialize_pbh_counters
 from . import plugins
-
+from . import stp
 # This is from the aliases example:
 # https://github.com/pallets/click/blob/57c6f09611fc47ca80db0bd010f05998b3c0aa95/examples/aliases/aliases.py
 class Config(object):
@@ -145,6 +145,10 @@ def ipv6():
     pass
 
 
+# 'STP'
+#
+cli.add_command(stp.spanning_tree)
+
 #
 # Inserting BGP functionality into cli's clear parse-chain.
 # BGP commands are determined by the routing-stack being elected.
@@ -229,16 +233,38 @@ def watermark():
     if os.geteuid() != 0:
         sys.exit("Root privileges are required for this operation")
 
+
+@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)
 @watermark.command('headroom')
-def clear_wm_pg_headroom():
+def clear_wm_pg_headroom(namespace):
     """Clear user headroom WM for pg"""
     command = ['watermarkstat', '-c', '-t', 'pg_headroom']
+    if namespace:
+        command += ['-n', str(namespace)]
     run_command(command)
 
+
 @watermark.command('shared')
-def clear_wm_pg_shared():
+@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 clear_wm_pg_shared(namespace):
     """Clear user shared WM for pg"""
     command = ['watermarkstat', '-c', '-t', 'pg_shared']
+    if namespace:
+        command += ['-n', str(namespace)]
     run_command(command)
 
 @priority_group.group()
@@ -261,16 +287,38 @@ def persistent_watermark():
     if os.geteuid() != 0:
         sys.exit("Root privileges are required for this operation")
 
+
 @persistent_watermark.command('headroom')
-def clear_pwm_pg_headroom():
+@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 clear_pwm_pg_headroom(namespace):
     """Clear persistent headroom WM for pg"""
     command = ['watermarkstat', '-c', '-p', '-t', 'pg_headroom']
+    if namespace:
+        command += ['-n', str(namespace)]
     run_command(command)
 
+
 @persistent_watermark.command('shared')
-def clear_pwm_pg_shared():
+@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 clear_pwm_pg_shared(namespace):
     """Clear persistent shared WM for pg"""
     command = ['watermarkstat', '-c', '-p', '-t', 'pg_shared']
+    if namespace:
+        command += ['-n', str(namespace)]
     run_command(command)
 
 
@@ -285,69 +333,159 @@ def watermark():
     if os.geteuid() != 0:
         sys.exit("Root privileges are required for this operation")
 
+
 @watermark.command('unicast')
-def clear_wm_q_uni():
+@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 clear_wm_q_uni(namespace):
     """Clear user WM for unicast queues"""
     command = ['watermarkstat', '-c', '-t', 'q_shared_uni']
+    if namespace:
+        command += ['-n', str(namespace)]
     run_command(command)
 
+
 @watermark.command('multicast')
-def clear_wm_q_multi():
+@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 clear_wm_q_multi(namespace):
     """Clear user WM for multicast queues"""
     command = ['watermarkstat', '-c', '-t', 'q_shared_multi']
+    if namespace:
+        command += ['-n', str(namespace)]
     run_command(command)
 
+
 @watermark.command('all')
-def clear_wm_q_all():
+@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 clear_wm_q_all(namespace):
     """Clear user WM for all queues"""
     command = ['watermarkstat', '-c', '-t', 'q_shared_all']
+    if namespace:
+        command += ['-n', str(namespace)]
     run_command(command)
 
+
 @queue.group(name='persistent-watermark')
 def persistent_watermark():
     """Clear queue persistent WM. One does not simply clear WM, root is required"""
     if os.geteuid() != 0:
         sys.exit("Root privileges are required for this operation")
 
+
 @persistent_watermark.command('unicast')
-def clear_pwm_q_uni():
+@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 clear_pwm_q_uni(namespace):
     """Clear persistent WM for persistent queues"""
     command = ['watermarkstat', '-c', '-p', '-t', 'q_shared_uni']
+    if namespace:
+        command += ['-n', str(namespace)]
     run_command(command)
 
+
 @persistent_watermark.command('multicast')
-def clear_pwm_q_multi():
+@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 clear_pwm_q_multi(namespace):
     """Clear persistent WM for multicast queues"""
     command = ['watermarkstat', '-c', '-p', '-t', 'q_shared_multi']
+    if namespace:
+        command += ['-n', str(namespace)]
     run_command(command)
 
+
 @persistent_watermark.command('all')
-def clear_pwm_q_all():
+@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 clear_pwm_q_all(namespace):
     """Clear persistent WM for all queues"""
     command = ['watermarkstat', '-c', '-p', '-t', 'q_shared_all']
+    if namespace:
+        command += ['-n', str(namespace)]
     run_command(command)
 
+
 @cli.group(name='headroom-pool')
 def headroom_pool():
     """Clear headroom pool WM"""
     pass
 
+
 @headroom_pool.command('watermark')
-def watermark():
+@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 watermark(namespace):
     """Clear headroom pool user WM. One does not simply clear WM, root is required"""
     if os.geteuid() != 0:
         sys.exit("Root privileges are required for this operation")
 
     command = ['watermarkstat', '-c', '-t', 'headroom_pool']
+    if namespace:
+        command += ['-n', str(namespace)]
     run_command(command)
 
+
 @headroom_pool.command('persistent-watermark')
-def persistent_watermark():
+@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 persistent_watermark(namespace):
     """Clear headroom pool persistent WM. One does not simply clear WM, root is required"""
     if os.geteuid() != 0:
         sys.exit("Root privileges are required for this operation")
 
     command = ['watermarkstat', '-c', '-p', '-t', 'headroom_pool']
+    if namespace:
+        command += ['-n', str(namespace)]
     run_command(command)
 
 #

clear/stp.py

@@ -0,0 +1,46 @@
+import click
+import utilities_common.cli as clicommon
+
+#
+# This group houses Spanning_tree commands and subgroups
+#
+
+
+@click.group(cls=clicommon.AliasedGroup)
+@click.pass_context
+def spanning_tree(ctx):
+    '''Clear Spanning-tree counters'''
+    pass
+
+
+@spanning_tree.group('statistics', cls=clicommon.AliasedGroup, invoke_without_command=True)
+@click.pass_context
+def stp_clr_stats(ctx):
+    if ctx.invoked_subcommand is None:
+        command = 'sudo stpctl clrstsall'
+        clicommon.run_command(command)
+
+
+@stp_clr_stats.command('interface')
+@click.argument('interface_name', metavar='<interface_name>', required=True)
+@click.pass_context
+def stp_clr_stats_intf(ctx, interface_name):
+    command = 'sudo stpctl clrstsintf ' + interface_name
+    clicommon.run_command(command)
+
+
+@stp_clr_stats.command('vlan')
+@click.argument('vlan_id', metavar='<vlan_id>', required=True)
+@click.pass_context
+def stp_clr_stats_vlan(ctx, vlan_id):
+    command = 'sudo stpctl clrstsvlan ' + vlan_id
+    clicommon.run_command(command)
+
+
+@stp_clr_stats.command('vlan-interface')
+@click.argument('vlan_id', metavar='<vlan_id>', required=True)
+@click.argument('interface_name', metavar='<interface_name>', required=True)
+@click.pass_context
+def stp_clr_stats_vlan_intf(ctx, vlan_id, interface_name):
+    command = 'sudo stpctl clrstsvlanintf ' + vlan_id + ' ' + interface_name
+    clicommon.run_command(command)