Add show reboot-history

LICENSE

@@ -0,0 +1,13 @@
+Copyright 2016-2020 Microsoft, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

README.md

@@ -15,6 +15,44 @@ This repository produces two packages, as follows:
 
 A Python wheel package, containing all the Python source code for the command-line utilities
 
+#### Setting up a build/test environment
+
+The sonic-utilities package depends on a number of other packages, many of which are available via PyPI, but some are part of the SONiC codebase. When building/testing the package, setuptools/pip will attempt to install the packages available from PyPI. However, you will need to manually build and install the SONiC dependencies before attempting to build or test the package.
+
+Currently, this list of dependencies is as follows:
+
+
+- libyang_1.0.73_amd64.deb
+- libyang-cpp_1.0.73_amd64.deb
+- python2-yang_1.0.73_amd64.deb
+- python3-yang_1.0.73_amd64.deb
+- redis_dump_load-1.1-py2-none-any.whl
+- swsssdk-2.0.1-py2-none-any.whl
+- sonic_py_common-1.0-py2-none-any.whl
+- sonic_config_engine-1.0-py2-none-any.whl
+- sonic_yang_mgmt-1.0-py2-none-any.whl
+- sonic_yang_models-1.0-py3-none-any.whl
+
+
+A convenient alternative is to let the SONiC build system configure a build enviroment for you. This can be done by cloning the [sonic-buildimage](https://github.com/Azure/sonic-buildimage) repo, building the sonic-utilities package inside the Debian Buster slave container, and staying inside the container once the build finishes. During the build process, the SONiC build system will build and install all the necessary dependencies inside the container. After following the instructions to clone and initialize the sonic-buildimage repo, this can be done as follows:
+
+1. Configure the build environment for an ASIC type (any type will do, here we use `generic`)
+    ```
+    make configure PLATFORM=generic
+    ```
+
+2. Build the sonic-utilities Python wheel package inside the Buster slave container, and tell the build system to keep the container alive when finished
+    ```
+    make NOJESSIE=1 NOSTRETCH=1 KEEP_SLAVE_ON=yes target/python-wheels/sonic_utilities-1.2-py2-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
+    ```
+    user@911799f161a0:/sonic$ cd src/sonic-utilities/
+    ```
+
+4. You can now make changes to the sonic-utilities source and build the package or run unit tests with the commands below. When finished, you can exit the container by calling `exit`.
+
 #### To build
 
 ```

config/console.py

@@ -65,6 +65,92 @@ def remove_console_setting(db, linenum):
         ctx = click.get_current_context()
         ctx.fail("Trying to delete console port setting, which is not present.")
 
+#
+# 'console remote_device' group ('config console remote_device ...')
+#
+@console.command('remote_device')
+@clicommon.pass_db
+@click.argument('linenum', metavar='<line_number>', required=True, type=click.IntRange(0, 65535))
+@click.argument('devicename', metavar='<device_name>', required=False)
+def upate_console_remote_device_name(db, linenum, devicename):
+    """Update remote device name for a console line"""
+    config_db = db.cfgdb
+    ctx = click.get_current_context()
+
+    table = "CONSOLE_PORT"
+    dataKey = 'remote_device'
+
+    data = config_db.get_entry(table, linenum)
+    if data:
+        if dataKey in data and devicename == data[dataKey]:
+            # do nothing if the device name is same with existing configurtion
+            return
+        elif not devicename:
+            # remove configuration key from console setting if user not give a remote device name
+            data.pop(dataKey, None)
+            config_db.mod_entry(table, linenum, data)
+        elif isExistingSameDevice(config_db, devicename, table):
+            ctx.fail("Given device name {} has been used. Please enter a valid device name or remove the existing one !!".format(devicename))
+        else:
+            data[dataKey] = devicename
+            config_db.mod_entry(table, linenum, data)
+    else:
+        ctx.fail("Trying to update console port setting, which is not present.")
+
+#
+# 'console baud' group ('config console baud ...')
+#
+@console.command('baud')
+@clicommon.pass_db
+@click.argument('linenum', metavar='<line_number>', required=True, type=click.IntRange(0, 65535))
+@click.argument('baud', metavar='<baud>', required=True, type=click.INT)
+def update_console_baud(db, linenum, baud):
+    """Update baud for a console line"""
+    config_db = db.cfgdb
+    ctx = click.get_current_context()
+
+    table = "CONSOLE_PORT"
+    dataKey = 'baud_rate'
+
+    data = config_db.get_entry(table, linenum)
+    if data:
+        baud = str(baud)
+        if dataKey in data and baud == data[dataKey]:
+            # do nothing if the baud is same with existing configurtion
+            return
+        else:
+            data[dataKey] = baud
+            config_db.mod_entry(table, linenum, data)
+    else:
+        ctx.fail("Trying to update console port setting, which is not present.")
+
+#
+# 'console flow_control' group ('config console flow_control ...')
+#
+@console.command('flow_control')
+@clicommon.pass_db
+@click.argument('mode', metavar='<mode>', required=True, type=click.Choice(["enable", "disable"]))
+@click.argument('linenum', metavar='<line_number>', required=True, type=click.IntRange(0, 65535))
+def update_console_flow_control(db, mode, linenum):
+    """Update flow control setting for a console line"""
+    config_db = db.cfgdb
+    ctx = click.get_current_context()
+
+    table = "CONSOLE_PORT"
+    dataKey = 'flow_control'
+
+    innerMode = "1" if mode == "enable" else "0"
+
+    data = config_db.get_entry(table, linenum)
+    if data:
+        if dataKey in data and innerMode == data[dataKey]:
+            # do nothing if the flow control setting is same with existing configurtion
+            return
+        else:
+            data[dataKey] = innerMode
+            config_db.mod_entry(table, linenum, data)
+    else:
+        ctx.fail("Trying to update console port setting, which is not present.")
 
 def isExistingSameDevice(config_db, deviceName, table):
     """Check if the given device name is conflict with existing device"""
@@ -73,4 +159,4 @@ def isExistingSameDevice(config_db, deviceName, table):
         if "remote_device" in values and deviceName == values["remote_device"]:
             return True
 
-    return False
+    return False

config/vlan.py

@@ -1,6 +1,7 @@
 import click
-
 import utilities_common.cli as clicommon
+
+from time import sleep
 from .utils import log
 
 #
@@ -50,6 +51,42 @@ def del_vlan(db, vid):
         db.cfgdb.set_entry('VLAN_MEMBER', k, None)
     db.cfgdb.set_entry('VLAN', 'Vlan{}'.format(vid), None)
 
+def restart_ndppd():
+    verify_swss_running_cmd = "docker container inspect -f '{{.State.Status}}' swss"
+    docker_exec_cmd = "docker exec -it swss {}"
+    ndppd_config_gen_cmd = "sonic-cfggen -d -t /usr/share/sonic/templates/ndppd.conf.j2,/etc/ndppd.conf"
+    ndppd_restart_cmd = "supervisorctl restart ndppd"
+
+    output = clicommon.run_command(verify_swss_running_cmd, return_cmd=True)
+
+    if output and output.strip() != "running":
+        click.echo(click.style('SWSS container is not running, changes will take effect the next time the SWSS container starts', fg='red'),)
+        return
+
+    clicommon.run_command(docker_exec_cmd.format(ndppd_config_gen_cmd), display_cmd=True)
+    sleep(3)
+    clicommon.run_command(docker_exec_cmd.format(ndppd_restart_cmd), display_cmd=True)
+
+
+@vlan.command('proxy_arp')
+@click.argument('vid', metavar='<vid>', required=True, type=int)
+@click.argument('mode', metavar='<mode>', required=True, type=click.Choice(["enabled", "disabled"]))
+@clicommon.pass_db
+def config_proxy_arp(db, vid, mode):
+    """Configure proxy ARP for a VLAN"""
+
+    log.log_info("'setting proxy ARP to {} for Vlan{}".format(mode, vid))
+
+    ctx = click.get_current_context()
+
+    vlan = 'Vlan{}'.format(vid)
+
+    if not clicommon.is_valid_vlan_interface(db.cfgdb, vlan):
+        ctx.fail("Interface {} does not exist".format(vlan))
+
+    db.cfgdb.set_entry('VLAN_INTERFACE', vlan, {"proxy_arp": mode})
+    click.echo('Proxy ARP setting saved to ConfigDB')
+    restart_ndppd()
 #
 # 'member' group ('config vlan member ...')
 #

consutil/lib.py

@@ -10,7 +10,9 @@
     import re
     import subprocess
     import sys
+    import os
     from swsssdk import ConfigDBConnector
+    from sonic_py_common import device_info
 except ImportError as e:
     raise ImportError("%s - required module not found" % str(e))
 
@@ -27,6 +29,8 @@
 FLOW_KEY = "flow_control"
 DEFAULT_BAUD = "9600"
 
+FILENAME = "udevprefix.conf"
+
 # QUIET == True => picocom will not output any messages, and pexpect will wait for console
 #                  switch login or command line to let user interact with shell
 #        Downside: if console switch output ever does not match DEV_READY_MSG, program will think connection failed
@@ -37,19 +41,27 @@
 DEV_READY_MSG = r"([Ll]ogin:|[Pp]assword:|[$>#])" # login prompt or command line prompt
 TIMEOUT_SEC = 0.2
 
-# runs command, exit if stderr is written to, returns stdout otherwise
-# input: cmd (str), output: output of cmd (str)
-def run_command(cmd):
+platform_path, _ = device_info.get_paths_to_platform_and_hwsku_dirs()
+PLUGIN_PATH = "/".join([platform_path, "plugins", FILENAME])
+
+if os.path.exists(PLUGIN_PATH):
+    fp = open(PLUGIN_PATH, 'r')
+    line = fp.readlines()
+    DEVICE_PREFIX = "/dev/" + line[0]
+
+# runs command, exit if stderr is written to and abort argument is ture, returns stdout, stderr otherwise
+# input: cmd (str, bool), output: output of cmd (str) and error of cmd (str) if abort is not true
+def run_command(cmd, abort=True):
     proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
     output = proc.stdout.read()
     error = proc.stderr.read()
-    if error != "":
+    if abort and error != "":
         click.echo("Command resulted in error: {}".format(error))
         sys.exit(ERR_CMD)
-    return output
+    return output if abort else (output, error)
 
 # returns a list of all lines
-def getAllLines():
+def getAllLines(brief=False):
     config_db = ConfigDBConnector()
     config_db.connect()
 
@@ -61,16 +73,17 @@ def getAllLines():
         line[LINE_KEY] = k
         lines.append(line)
 
-    # Querying device directory to get all available console ports 
-    cmd = "ls " + DEVICE_PREFIX + "*"
-    output = run_command(cmd)
-    availableTtys = output.split('\n')
-    availableTtys = list(filter(lambda dev: re.match(DEVICE_PREFIX + r"\d+", dev) != None, availableTtys))
-    for tty in availableTtys:
-        k = tty[len(DEVICE_PREFIX):]
-        if k not in keys:
-            line = { LINE_KEY: k }
-            lines.append(line)
+    # Querying device directory to get all available console ports
+    if not brief:
+        cmd = "ls " + DEVICE_PREFIX + "*"
+        output, _ = run_command(cmd, abort=False)
+        availableTtys = output.split('\n')
+        availableTtys = list(filter(lambda dev: re.match(DEVICE_PREFIX + r"\d+", dev) != None, availableTtys))
+        for tty in availableTtys:
+            k = tty[len(DEVICE_PREFIX):]
+            if k not in keys:
+                line = { LINE_KEY: k }
+                lines.append(line)
     return lines
 
 # returns a dictionary of busy lines and their info
@@ -119,4 +132,4 @@ def getLine(target, deviceBool=False):
             lineNumber = line[LINE_KEY]
             targetLine = line
 
-    return targetLine if lineNumber else None
+    return targetLine if lineNumber else None

consutil/main.py

@@ -25,9 +25,10 @@ def consutil():
 
 # 'show' subcommand
 @consutil.command()
-def show():
-    """Show all lines and their info"""
-    lines = getAllLines()
+@click.option('--brief', '-b', metavar='<brief_mode>', required=False, is_flag=True)
+def show(brief):
+    """Show all lines and their info include available ttyUSB devices unless specified brief mode"""
+    lines = getAllLines(brief)
     busyLines = getBusyLines()
 
     # sort lines for table rendering
@@ -59,7 +60,7 @@ def clear(target):
     """Clear preexisting connection to line"""
     targetLine = getLine(target)
     if not targetLine:
-        click.echo("Target [{}] does not exist".format(linenum))
+        click.echo("Target [{}] does not exist".format(target))
         sys.exit(ERR_DEV)
     lineNumber = targetLine[LINE_KEY]
 

counterpoll/main.py

@@ -1,6 +1,7 @@
 #! /usr/bin/python -u
 
 import click
+import json
 import swsssdk
 from tabulate import tabulate
 
@@ -234,3 +235,37 @@ def show():
 
     click.echo(tabulate(data, headers=header, tablefmt="simple", missingval=""))
 
+def _update_config_db(status, filename):
+    """ Update counter configuration in config_db file """
+    with open(filename) as config_db_file:
+        config_db = json.load(config_db_file)
+
+    write_config_db = False
+    if "FLEX_COUNTER_TABLE" in config_db:
+        for counter, counter_config in config_db["FLEX_COUNTER_TABLE"].items():
+            if "FLEX_COUNTER_STATUS" in counter_config and \
+                counter_config["FLEX_COUNTER_STATUS"] is not status:
+                counter_config["FLEX_COUNTER_STATUS"] = status
+                write_config_db = True
+
+    if write_config_db:
+        with open(filename, 'w') as config_db_file:
+            json.dump(config_db, config_db_file, indent=4)
+
+# Working on Config DB
+@cli.group()
+def config_db():
+    """ Config DB counter commands """
+
+@config_db.command()
+@click.argument("filename", default="/etc/sonic/config_db.json", type=click.Path(exists=True))
+def enable(filename):
+    """ Enable counter configuration in config_db file """
+    _update_config_db("enable", filename)
+
+@config_db.command()
+@click.argument("filename", default="/etc/sonic/config_db.json", type=click.Path(exists=True))
+def disable(filename):
+    """ Disable counter configuration in config_db file """
+    _update_config_db("disable", filename)
+