Merge branch 'master' into acl-fc

sonic-net · Nov 8, 2021 · 988baa1 · 988baa1
2 parents 0afe956 + 563c416
commit 988baa1
Show file tree

Hide file tree

Showing 115 changed files with 6,358 additions and 855 deletions.
diff --git a/.azure-pipelines/build_and_install_module.sh b/.azure-pipelines/build_and_install_module.sh
@@ -50,6 +50,7 @@ function build_and_install_kmodule()
     echo CONFIG_MACSEC=m >> .config
     echo CONFIG_NET_VENDOR_MICROSOFT=y >> .config
     echo CONFIG_MICROSOFT_MANA=m >> .config
+    echo CONFIG_SYSTEM_REVOCATION_LIST=n >> .config
     make VERSION=$VERSION PATCHLEVEL=$PATCHLEVEL SUBLEVEL=$SUBLEVEL EXTRAVERSION=-${EXTRAVERSION} LOCALVERSION=-${LOCALVERSION} modules_prepare
     make M=drivers/net/team
     mv drivers/net/Makefile drivers/net/Makefile.bak

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -19,6 +19,9 @@ stages:
   jobs:
   - job:
     displayName: "Python3"
+    variables:
+      DIFF_COVER_CHECK_THRESHOLD: 0
+      DIFF_COVER_ENABLE: 'true'
     pool:
       vmImage: ubuntu-20.04
 

diff --git a/clear/main.py b/clear/main.py
@@ -193,6 +193,12 @@ def dropcounters():
     command = "dropstat -c clear"
     run_command(command)
 
+@cli.command()
+def tunnelcounters():
+    """Clear Tunnel counters"""
+    command = "tunnelstat -c"
+    run_command(command)
+
 #
 # 'clear watermarks
 #

diff --git a/config/kdump.py b/config/kdump.py
@@ -43,6 +43,8 @@ def kdump_disable(db):
     check_kdump_table_existence(kdump_table)
 
     db.cfgdb.mod_entry("KDUMP", "config", {"enabled": "false"})
+    click.echo("KDUMP configuration changes may require a reboot to take effect.")
+    click.echo("Save SONiC configuration using 'config save' before issuing the reboot command.")
 
 
 #
@@ -56,6 +58,8 @@ def kdump_enable(db):
     check_kdump_table_existence(kdump_table)
 
     db.cfgdb.mod_entry("KDUMP", "config", {"enabled": "true"})
+    click.echo("KDUMP configuration changes may require a reboot to take effect.")
+    click.echo("Save SONiC configuration using 'config save' before issuing the reboot command.")
 
 
 #
@@ -70,6 +74,8 @@ def kdump_memory(db, kdump_memory):
     check_kdump_table_existence(kdump_table)
 
     db.cfgdb.mod_entry("KDUMP", "config", {"memory": kdump_memory})
+    click.echo("KDUMP configuration changes may require a reboot to take effect.")
+    click.echo("Save SONiC configuration using 'config save' before issuing the reboot command.")
 
 
 #