Merge remote-tracking branch 'arlakshm/master' into masic_teamshow

Author: arlakshm

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,7 +9,7 @@ If this is a bug fix, make sure your description includes "closes #xxxx",
 issue when the PR is merged.
 
 If you are adding/modifying/removing any command or utility script, please also
-make sure to add/modify/remove any unit tests from the sonic-utilities-tests
+make sure to add/modify/remove any unit tests from the tests
 directory as appropriate.
 
 If you are modifying or removing an existing 'show', 'config' or 'sonic-clear'

acl_loader/main.py

@@ -4,15 +4,13 @@
 import ipaddr
 import json
 import syslog
-import tabulate
-from natsort import natsorted
-import sonic_device_util
 
 import openconfig_acl
+import tabulate
 import pyangbind.lib.pybindJSON as pybindJSON
-from swsssdk import ConfigDBConnector
-from swsssdk import SonicV2Connector
-from swsssdk import SonicDBConfig
+from natsort import natsorted
+from sonic_py_common import device_info
+from swsssdk import ConfigDBConnector, SonicV2Connector, SonicDBConfig
 
 
 def info(msg):
@@ -142,7 +140,7 @@ def __init__(self):
 
         # Getting all front asic namespace and correspding config and state DB connector
 
-        namespaces = sonic_device_util.get_all_namespaces()
+        namespaces = device_info.get_all_namespaces()
         for front_asic_namespaces in namespaces['front_ns']:
             self.per_npu_configdb[front_asic_namespaces] = ConfigDBConnector(use_unix_socket_path=True, namespace=front_asic_namespaces)
             self.per_npu_configdb[front_asic_namespaces].connect()

config/aaa.py

@@ -2,19 +2,9 @@
 # -*- coding: utf-8 -*-
 
 import click
-import netaddr
-from swsssdk import ConfigDBConnector
-
-
-def is_ipaddress(val):
-    if not val:
-        return False
-    try:
-        netaddr.IPAddress(str(val))
-    except ValueError:
-        return False
-    return True
 
+from swsssdk import ConfigDBConnector
+import utilities_common.cli as clicommon
 
 def add_table_kv(table, entry, key, val):
     config_db = ConfigDBConnector()
@@ -31,7 +21,6 @@ def del_table_key(table, entry, key):
             del data[key]
         config_db.set_entry(table, entry, data)
 
-
 @click.group()
 def aaa():
     """AAA command line"""
@@ -81,7 +70,7 @@ def fallback(option):
 def login(auth_protocol):
     """Switch login authentication [ {tacacs+, local} | default ]"""
     if len(auth_protocol) is 0:
-        print 'Not support empty argument'
+        click.echo('Argument "auth_protocol" is required')
         return
 
     if 'default' in auth_protocol:
@@ -118,7 +107,7 @@ def timeout(ctx, second):
     elif second:
         add_table_kv('TACPLUS', 'global', 'timeout', second)
     else:
-        click.echo('Not support empty argument')
+        click.echo('Argument "second" is required')
 tacacs.add_command(timeout)
 default.add_command(timeout)
 
@@ -133,7 +122,7 @@ def authtype(ctx, type):
     elif type:
         add_table_kv('TACPLUS', 'global', 'auth_type', type)
     else:
-        click.echo('Not support empty argument')
+        click.echo('Argument "type" is required')
 tacacs.add_command(authtype)
 default.add_command(authtype)
 
@@ -148,7 +137,7 @@ def passkey(ctx, secret):
     elif secret:
         add_table_kv('TACPLUS', 'global', 'passkey', secret)
     else:
-        click.echo('Not support empty argument')
+        click.echo('Argument "secret" is required')
 tacacs.add_command(passkey)
 default.add_command(passkey)
 
@@ -164,7 +153,7 @@ def passkey(ctx, secret):
 @click.option('-m', '--use-mgmt-vrf', help="Management vrf, default is no vrf", is_flag=True)
 def add(address, timeout, key, auth_type, port, pri, use_mgmt_vrf):
     """Specify a TACACS+ server"""
-    if not is_ipaddress(address):
+    if not clicommon.is_ipaddress(address):
         click.echo('Invalid ip address')
         return
 
@@ -196,7 +185,7 @@ def add(address, timeout, key, auth_type, port, pri, use_mgmt_vrf):
 @click.argument('address', metavar='<ip_address>')
 def delete(address):
     """Delete a TACACS+ server"""
-    if not is_ipaddress(address):
+    if not clicommon.is_ipaddress(address):
         click.echo('Invalid ip address')
         return
 

config/config_mgmt.py

@@ -83,7 +83,7 @@ def __init__(self, source="configDB", debug=False, allowTablesWithoutYang=True):
     def __del__(self):
         pass
 
-    def tablesWithoutYang(self):
+    def tablesWithOutYang(self):
         '''
         Return tables loaded in config for which YANG model does not exist.
 

config/feature.py

@@ -0,0 +1,48 @@
+import click
+
+from utilities_common.cli import AbbreviationGroup, pass_db
+
+#
+# 'feature' group ('config feature ...')
+#
+@click.group(cls=AbbreviationGroup, name='feature', invoke_without_command=False)
+def feature():
+    """Configure features"""
+    pass
+
+#
+# 'state' command ('config feature state ...')
+#
+@feature.command('state', short_help="Enable/disable a feature")
+@click.argument('name', metavar='<feature-name>', required=True)
+@click.argument('state', metavar='<state>', required=True, type=click.Choice(["enabled", "disabled"]))
+@pass_db
+def feature_state(db, name, state):
+    """Enable/disable a feature"""
+    state_data = db.cfgdb.get_entry('FEATURE', name)
+
+    if not state_data:
+        click.echo("Feature '{}' doesn't exist".format(name))
+        sys.exit(1)
+
+    db.cfgdb.mod_entry('FEATURE', name, {'state': state})
+
+#
+# 'autorestart' command ('config feature autorestart ...')
+#
+@feature.command(name='autorestart', short_help="Enable/disable autosrestart of a feature")
+@click.argument('name', metavar='<feature-name>', required=True)
+@click.argument('autorestart', metavar='<autorestart>', required=True, type=click.Choice(["enabled", "disabled"]))
+@pass_db
+def feature_autorestart(db, name, autorestart):
+    """Enable/disable autorestart of a feature"""
+    feature_table = db.cfgdb.get_table('FEATURE')
+    if not feature_table:
+        click.echo("Unable to retrieve feature table from Config DB.")
+        sys.exit(1)
+
+    if not feature_table.has_key(name):
+        click.echo("Unable to retrieve feature '{}'".format(name))
+        sys.exit(1)
+
+    db.cfgdb.mod_entry('FEATURE', name, {'auto_restart': autorestart})