Merge branch 'master' into breakout_cli_msft

Author: samaity

README.md

@@ -1,3 +1,8 @@
+[![Total alerts](https://img.shields.io/lgtm/alerts/g/Azure/sonic-utilities.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Azure/sonic-utilities/alerts/)
+[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/Azure/sonic-utilities.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Azure/sonic-utilities/context:python)
+
+[![Build](https://sonic-jenkins.westus2.cloudapp.azure.com/job/common/job/sonic-utilities-build/badge/icon)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/common/job/sonic-utilities-build/)
+
 # SONiC: Software for Open Networking in the Cloud
 
 ## sonic-utilities
@@ -23,21 +28,21 @@ Guide for performing commits:
 * Use a standard commit message format:
 
 >     [component/folder touched]: Description intent of your changes
-> 
+>
 >     [List of changes]
->     
+>
 > 	  Signed-off-by: Your Name [email protected]
-    
+
 For example:
 
 >     swss-common: Stabilize the ConsumerTable
->     
+>
 >     * Fixing autoreconf
 >     * Fixing unit-tests by adding checkers and initialize the DB before start
 >     * Adding the ability to select from multiple channels
->     * Health-Monitor - The idea of the patch is that if something went wrong with the notification channel, 
+>     * Health-Monitor - The idea of the patch is that if something went wrong with the notification channel,
 >       we will have the option to know about it (Query the LLEN table length).
->       
+>
 >       Signed-off-by: John Doe [email protected]
 
 

acl_loader/main.py

@@ -474,8 +474,11 @@ def deny_rule(self, table_name):
         rule_props = {}
         rule_data = {(table_name, "DEFAULT_RULE"): rule_props}
         rule_props["PRIORITY"] = str(self.min_priority)
-        rule_props["ETHER_TYPE"] = str(self.ethertype_map["ETHERTYPE_IPV4"])
         rule_props["PACKET_ACTION"] = "DROP"
+        if 'v6' in table_name.lower():
+            rule_props["ETHER_TYPE"] = str(self.ethertype_map["ETHERTYPE_IPV6"])
+        else:
+            rule_props["ETHER_TYPE"] = str(self.ethertype_map["ETHERTYPE_IPV4"])
         return rule_data
 
     def convert_rules(self):

clear/bgp_frr_v6.py

@@ -1,5 +1,5 @@
 import click
-from clear.main import *
+from clear.main import ipv6, run_command
 
 
 ###############################################################################
@@ -9,40 +9,28 @@
 ###############################################################################
 
 
-@ipv6.group(cls=AliasedGroup, default_if_no_args=True,
-            context_settings=CONTEXT_SETTINGS)
+@ipv6.group()
 def bgp():
     """Clear IPv6 BGP (Border Gateway Protocol) information"""
     pass
 
-
-# Default 'bgp' command (called if no subcommands or their aliases were passed)
-@bgp.command(default=True)
-def default():
-    """Clear all BGP peers"""
-    command = 'sudo vtysh -c "clear bgp ipv6 *"'
-    run_command(command)
-
-
-@bgp.group(cls=AliasedGroup, default_if_no_args=True,
-           context_settings=CONTEXT_SETTINGS)
+@bgp.group()
 def neighbor():
     """Clear specific BGP peers"""
     pass
 
-
-@neighbor.command(default=True)
+# 'all' subcommand
+@neighbor.command('all')
 @click.argument('ipaddress', required=False)
-def default(ipaddress):
+def neigh_all(ipaddress):
     """Clear all BGP peers"""
 
     if ipaddress is not None:
-        command = 'sudo vtysh -c "clear bgp ipv6 {} "'.format(ipaddress)
+        command = 'sudo vtysh -c "clear bgp ipv6 {}"'.format(ipaddress)
     else:
         command = 'sudo vtysh -c "clear bgp ipv6 *"'
     run_command(command)
 
-
 # 'in' subcommand
 @neighbor.command('in')
 @click.argument('ipaddress', required=False)
@@ -69,25 +57,11 @@ def neigh_out(ipaddress):
     run_command(command)
 
 
-@neighbor.group(cls=AliasedGroup, default_if_no_args=True,
-                context_settings=CONTEXT_SETTINGS)
+@neighbor.group()
 def soft():
     """Soft reconfig BGP's inbound/outbound updates"""
     pass
 
-
-@soft.command(default=True)
-@click.argument('ipaddress', required=False)
-def default(ipaddress):
-    """Clear BGP neighbors soft configuration"""
-
-    if ipaddress is not None:
-        command = 'sudo vtysh -c "clear bgp ipv6 {} soft "'.format(ipaddress)
-    else:
-        command = 'sudo vtysh -c "clear bgp ipv6 * soft"'
-    run_command(command)
-
-
 # 'soft in' subcommand
 @soft.command('in')
 @click.argument('ipaddress', required=False)
@@ -101,6 +75,18 @@ def soft_in(ipaddress):
     run_command(command)
 
 
+# 'soft all' subcommand
+@neighbor.command('all')
+@click.argument('ipaddress', required=False)
+def soft_all(ipaddress):
+    """Clear BGP neighbors soft configuration"""
+
+    if ipaddress is not None:
+        command = 'sudo vtysh -c "clear bgp ipv6 {} soft"'.format(ipaddress)
+    else:
+        command = 'sudo vtysh -c "clear bgp ipv6 * soft"'
+    run_command(command)
+
 # 'soft out' subcommand
 @soft.command('out')
 @click.argument('ipaddress', required=False)

clear/bgp_quagga_v4.py

@@ -1,5 +1,5 @@
 import click
-from clear.main import *
+from clear.main import ip, run_command
 
 
 ###############################################################################
@@ -9,35 +9,25 @@
 ###############################################################################
 
 
-@ip.group(cls=AliasedGroup, default_if_no_args=True,
-          context_settings=CONTEXT_SETTINGS)
+@ip.group()
 def bgp():
     """Clear BGP (Border Gateway Protocol) peers"""
     pass
 
 
-# Default 'bgp' command (called if no subcommands or their aliases were passed)
-@bgp.command(default=True)
-def default():
-    """Clear all BGP peers"""
-    command = 'sudo vtysh -c "clear ip bgp *"'
-    run_command(command)
-
-
-@bgp.group(cls=AliasedGroup, default_if_no_args=True,
-           context_settings=CONTEXT_SETTINGS)
+@bgp.group()
 def neighbor():
     """Clear specific BGP peers"""
     pass
 
 
-@neighbor.command(default=True)
+@neighbor.command('all')
 @click.argument('ipaddress', required=False)
-def default(ipaddress):
+def neigh_all(ipaddress):
     """Clear all BGP peers"""
 
     if ipaddress is not None:
-        command = 'sudo vtysh -c "clear ip bgp {} "'.format(ipaddress)
+        command = 'sudo vtysh -c "clear ip bgp {}"'.format(ipaddress)
     else:
         command = 'sudo vtysh -c "clear ip bgp *"'
     run_command(command)
@@ -69,20 +59,19 @@ def neigh_out(ipaddress):
     run_command(command)
 
 
-@neighbor.group(cls=AliasedGroup, default_if_no_args=True,
-                context_settings=CONTEXT_SETTINGS)
+@neighbor.group()
 def soft():
     """Soft reconfig BGP's inbound/outbound updates"""
     pass
 
 
-@soft.command(default=True)
+@soft.command('all')
 @click.argument('ipaddress', required=False)
-def default(ipaddress):
+def soft_all(ipaddress):
     """Clear BGP neighbors soft configuration"""
 
     if ipaddress is not None:
-        command = 'sudo vtysh -c "clear ip bgp {} soft "'.format(ipaddress)
+        command = 'sudo vtysh -c "clear ip bgp {} soft"'.format(ipaddress)
     else:
         command = 'sudo vtysh -c "clear ip bgp * soft"'
     run_command(command)

clear/bgp_quagga_v6.py

@@ -1,5 +1,5 @@
 import click
-from clear.main import *
+from clear.main import ipv6, run_command
 
 
 ###############################################################################
@@ -9,35 +9,23 @@
 ###############################################################################
 
 
-@ipv6.group(cls=AliasedGroup, default_if_no_args=True,
-            context_settings=CONTEXT_SETTINGS)
+@ipv6.group()
 def bgp():
     """Clear IPv6 BGP (Border Gateway Protocol) information"""
     pass
 
-
-# Default 'bgp' command (called if no subcommands or their aliases were passed)
-@bgp.command(default=True)
-def default():
-    """Clear all BGP peers"""
-    command = 'sudo vtysh -c "clear ipv6 bgp *"'
-    run_command(command)
-
-
-@bgp.group(cls=AliasedGroup, default_if_no_args=True,
-           context_settings=CONTEXT_SETTINGS)
+@bgp.group()
 def neighbor():
     """Clear specific BGP peers"""
     pass
 
-
-@neighbor.command(default=True)
+@neighbor.command('all')
 @click.argument('ipaddress', required=False)
-def default(ipaddress):
+def neigh_all(ipaddress):
     """Clear all BGP peers"""
 
     if ipaddress is not None:
-        command = 'sudo vtysh -c "clear ipv6 bgp {} "'.format(ipaddress)
+        command = 'sudo vtysh -c "clear ipv6 bgp {}"'.format(ipaddress)
     else:
         command = 'sudo vtysh -c "clear ipv6 bgp *"'
     run_command(command)
@@ -69,20 +57,19 @@ def neigh_out(ipaddress):
     run_command(command)
 
 
-@neighbor.group(cls=AliasedGroup, default_if_no_args=True,
-                context_settings=CONTEXT_SETTINGS)
+@neighbor.group()
 def soft():
     """Soft reconfig BGP's inbound/outbound updates"""
     pass
 
 
-@soft.command(default=True)
+@soft.command('all')
 @click.argument('ipaddress', required=False)
-def default(ipaddress):
+def soft_all(ipaddress):
     """Clear BGP neighbors soft configuration"""
 
     if ipaddress is not None:
-        command = 'sudo vtysh -c "clear ipv6 bgp {} soft "'.format(ipaddress)
+        command = 'sudo vtysh -c "clear ipv6 bgp {} soft"'.format(ipaddress)
     else:
         command = 'sudo vtysh -c "clear ipv6 bgp * soft"'
     run_command(command)

clear/main.py

@@ -3,7 +3,6 @@
 import click
 import os
 import subprocess
-from click_default_group import DefaultGroup
 
 try:
     # noinspection PyPep8Naming
@@ -35,12 +34,10 @@ def read_config(self, filename):
 _config = None
 
 
-# This aliased group has been modified from click examples to inherit from DefaultGroup instead of click.Group.
-# DefaultFroup is a superclass of click.Group which calls a default subcommand instead of showing
-# a help message if no subcommand is passed
-class AliasedGroup(DefaultGroup):
-    """This subclass of a DefaultGroup supports looking up aliases in a config
-    file and with a bit of magic.
+
+class AliasedGroup(click.Group):
+    """This subclass of click.Group supports abbreviations and
+       looking up aliases in a config file with a bit of magic.
     """
 
     def get_command(self, ctx, cmd_name):
@@ -71,12 +68,9 @@ def get_command(self, ctx, cmd_name):
         matches = [x for x in self.list_commands(ctx)
                    if x.lower().startswith(cmd_name.lower())]
         if not matches:
-            # No command name matched. Issue Default command.
-            ctx.arg0 = cmd_name
-            cmd_name = self.default_cmd_name
-            return DefaultGroup.get_command(self, ctx, cmd_name)
+            return None
         elif len(matches) == 1:
-            return DefaultGroup.get_command(self, ctx, matches[0])
+            return click.Group.get_command(self, ctx, matches[0])
         ctx.fail('Too many matches: %s' % ', '.join(sorted(matches)))
 
 
@@ -95,7 +89,7 @@ def get_routing_stack():
         proc.wait()
         result = stdout.rstrip('\n')
 
-    except OSError, e:
+    except OSError as e:
         raise OSError("Cannot detect routing-stack")
 
     return (result)
@@ -380,5 +374,30 @@ def line(linenum):
     cmd = "consutil clear " + str(linenum)
     run_command(cmd)
 
+#
+# 'nat' group ("clear nat ...")
+#
+
+@cli.group(cls=AliasedGroup)
+def nat():
+    """Clear the nat info"""
+    pass
+
+# 'statistics' subcommand ("clear nat statistics")
+@nat.command()
+def statistics():
+    """ Clear all NAT statistics """
+
+    cmd = "natclear -s"
+    run_command(cmd)
+
+# 'translations' subcommand ("clear nat translations")
+@nat.command()
+def translations():
+    """ Clear all NAT translations """
+
+    cmd = "natclear -t"
+    run_command(cmd)
+
 if __name__ == '__main__':
     cli()

config/aaa.py

@@ -11,7 +11,7 @@ def is_ipaddress(val):
         return False
     try:
         netaddr.IPAddress(str(val))
-    except:
+    except ValueError:
         return False
     return True