Skip to content

Commit

Permalink
[config]: Change the order of interface commands (#504)
Browse files Browse the repository at this point in the history
before:
config interface <interface_name> COMMANDS ...
after:
config interface COMMANDS <interface_name> ...

To make backwards compatible with 201803 branch and older,
change the order of the command arguments.

Signed-off-by: Shu0T1an ChenG <[email protected]>
  • Loading branch information
Shuotian Cheng authored and yxieca committed Apr 8, 2019
1 parent 5ae30d2 commit 6ee0aea
Showing 1 changed file with 33 additions and 20 deletions.
53 changes: 33 additions & 20 deletions config/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -832,34 +832,31 @@ def neighbor(ipaddr_or_hostname, verbose):
#

@config.group()
@click.argument('interface_name', metavar='<interface_name>', required=True)
@click.pass_context
def interface(ctx, interface_name):
def interface(ctx):
"""Interface-related configuration tasks"""
config_db = ConfigDBConnector()
config_db.connect()
ctx.obj = {}
ctx.obj['config_db'] = config_db
if get_interface_naming_mode() == "alias":
ctx.obj['interface_name'] = interface_alias_to_name(interface_name)
if ctx.obj['interface_name'] is None:
ctx.fail("'interface_name' is None!")
else:
ctx.obj['interface_name'] = interface_name

#
# 'startup' subcommand
#

@interface.command()
@click.argument('interface_name', metavar='<interface_name>', required=True)
@click.pass_context
def startup(ctx):
def startup(ctx, interface_name):
"""Start up interface"""
config_db = ctx.obj['config_db']
interface_name = ctx.obj['interface_name']
if get_interface_naming_mode() == "alias":
interface_name = interface_alias_to_name(interface_name)
if interface_name is None:
ctx.fail("'interface_name' is None!")

if interface_name_is_valid(interface_name) is False:
ctx.fail("Interface name is invalid. Please enter a valid interface name!!")
ctx.fail("Interface name is invalid. Please enter a valid interface name!!")

if interface_name.startswith("Ethernet"):
config_db.mod_entry("PORT", interface_name, {"admin_status": "up"})
Expand All @@ -870,14 +867,18 @@ def startup(ctx):
#

@interface.command()
@click.argument('interface_name', metavar='<interface_name>', required=True)
@click.pass_context
def shutdown(ctx):
def shutdown(ctx, interface_name):
"""Shut down interface"""
config_db = ctx.obj['config_db']
interface_name = ctx.obj['interface_name']
if get_interface_naming_mode() == "alias":
interface_name = interface_alias_to_name(interface_name)
if interface_name is None:
ctx.fail("'interface_name' is None!")

if interface_name_is_valid(interface_name) is False:
ctx.fail("Interface name is invalid. Please enter a valid interface name!!")
ctx.fail("Interface name is invalid. Please enter a valid interface name!!")

if interface_name.startswith("Ethernet"):
config_db.mod_entry("PORT", interface_name, {"admin_status": "down"})
Expand All @@ -890,11 +891,15 @@ def shutdown(ctx):

@interface.command()
@click.pass_context
@click.argument('interface_name', metavar='<interface_name>', required=True)
@click.argument('interface_speed', metavar='<interface_speed>', required=True)
@click.option('-v', '--verbose', is_flag=True, help="Enable verbose output")
def speed(ctx, interface_speed, verbose):
def speed(ctx, interface_name, interface_speed, verbose):
"""Set interface speed"""
interface_name = ctx.obj['interface_name']
if get_interface_naming_mode() == "alias":
interface_name = interface_alias_to_name(interface_name)
if interface_name is None:
ctx.fail("'interface_name' is None!")

command = "portconfig -p {} -s {}".format(interface_name, interface_speed)
if verbose:
Expand All @@ -916,12 +921,16 @@ def ip(ctx):
#

@ip.command()
@click.argument('interface_name', metavar='<interface_name>', required=True)
@click.argument("ip_addr", metavar="<ip_addr>", required=True)
@click.pass_context
def add(ctx, ip_addr):
def add(ctx, interface_name, ip_addr):
"""Add an IP address towards the interface"""
config_db = ctx.obj["config_db"]
interface_name = ctx.obj["interface_name"]
if get_interface_naming_mode() == "alias":
interface_name = interface_alias_to_name(interface_name)
if interface_name is None:
ctx.fail("'interface_name' is None!")

if interface_name.startswith("Ethernet"):
config_db.set_entry("INTERFACE", (interface_name, ip_addr), {"NULL": "NULL"})
Expand All @@ -935,12 +944,16 @@ def add(ctx, ip_addr):
#

@ip.command()
@click.argument('interface_name', metavar='<interface_name>', required=True)
@click.argument("ip_addr", metavar="<ip_addr>", required=True)
@click.pass_context
def remove(ctx, ip_addr):
def remove(ctx, interface_name, ip_addr):
"""Remove an IP address from the interface"""
config_db = ctx.obj["config_db"]
interface_name = ctx.obj["interface_name"]
if get_interface_naming_mode() == "alias":
interface_name = interface_alias_to_name(interface_name)
if interface_name is None:
ctx.fail("'interface_name' is None!")

if interface_name.startswith("Ethernet"):
config_db.set_entry("INTERFACE", (interface_name, ip_addr), None)
Expand Down

0 comments on commit 6ee0aea

Please sign in to comment.