Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[show] replace shell=True, replace xml by lxml, replace exit by sys.exit #2666

Merged
merged 15 commits into from
May 31, 2023
Merged

[show] replace shell=True, replace xml by lxml, replace exit by sys.exit #2666

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4d96b6e
replace shell=True
maipbui Feb 9, 2023
6b0d24b
Address PR comments
maipbui Feb 15, 2023
b0b5bb6
Address PR comments
maipbui Feb 27, 2023
5fcc659
remove comments
maipbui Feb 27, 2023
09cba0d
modify string to list of str in bgp quagga
maipbui Mar 1, 2023
df8429d
resolve conflict
maipbui Apr 26, 2023
c4ec419
fix UT
maipbui Apr 26, 2023
bc8659d
fix run_command and UT
maipbui May 24, 2023
f3ee836
add UT
maipbui May 25, 2023
8afda93
add UT
maipbui May 25, 2023
2c29446
remove validation
maipbui May 26, 2023
a20435a
fix UT
maipbui May 26, 2023
b7f5c04
remove UT
maipbui May 31, 2023
531ab6a
resolve conflict
maipbui May 31, 2023
7bbdc97
add UT
maipbui May 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions show/bgp_quagga_v4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import click
from show.main import AliasedGroup, ip, run_command
from show.main import ip, run_command
from utilities_common.bgp_util import get_bgp_summary_extended
import utilities_common.constants as constants
import utilities_common.cli as clicommon


###############################################################################
Expand All @@ -11,7 +12,7 @@
###############################################################################


@ip.group(cls=AliasedGroup)
@ip.group(cls=clicommon.AliasedGroup)
def bgp():
"""Show IPv4 BGP (Border Gateway Protocol) information"""
pass
Expand All @@ -22,10 +23,10 @@ def bgp():
def summary():
"""Show summarized information of IPv4 BGP state"""
try:
device_output = run_command('sudo {} -c "show ip bgp summary"'.format(constants.RVTYSH_COMMAND), return_cmd=True)
device_output = run_command(['sudo', constants.RVTYSH_COMMAND, '-c', "show ip bgp summary"], return_cmd=True)
get_bgp_summary_extended(device_output)
except Exception:
run_command('sudo {} -c "show ip bgp summary"'.format(constants.RVTYSH_COMMAND))
run_command(['sudo', constants.RVTYSH_COMMAND, '-c', "show ip bgp summary"])


# 'neighbors' subcommand ("show ip bgp neighbors")
Expand All @@ -35,15 +36,13 @@ def summary():
def neighbors(ipaddress, info_type):
"""Show IP (IPv4) BGP neighbors"""

command = 'sudo {} -c "show ip bgp neighbor'.format(constants.RVTYSH_COMMAND)
command = ['sudo', constants.RVTYSH_COMMAND, '-c', "show ip bgp neighbor"]

if ipaddress is not None:
command += ' {}'.format(ipaddress)
command[-1] += ' {}'.format(ipaddress)

# info_type is only valid if ipaddress is specified
if info_type is not None:
command += ' {}'.format(info_type)

command += '"'
command[-1] += ' {}'.format(info_type)

run_command(command)
11 changes: 6 additions & 5 deletions show/bgp_quagga_v6.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import click
from show.main import AliasedGroup, ipv6, run_command
from show.main import ipv6, run_command
from utilities_common.bgp_util import get_bgp_summary_extended
import utilities_common.constants as constants
import utilities_common.cli as clicommon


###############################################################################
Expand All @@ -11,7 +12,7 @@
###############################################################################


@ipv6.group(cls=AliasedGroup)
@ipv6.group(cls=clicommon.AliasedGroup)
def bgp():
"""Show IPv6 BGP (Border Gateway Protocol) information"""
pass
Expand All @@ -22,10 +23,10 @@ def bgp():
def summary():
"""Show summarized information of IPv6 BGP state"""
try:
device_output = run_command('sudo {} -c "show ipv6 bgp summary"'.format(constants.RVTYSH_COMMAND), return_cmd=True)
device_output = run_command(['sudo', constants.RVTYSH_COMMAND, '-c', "show ipv6 bgp summary"], return_cmd=True)
get_bgp_summary_extended(device_output)
except Exception:
run_command('sudo {} -c "show ipv6 bgp summary"'.format(constants.RVTYSH_COMMAND))
run_command(['sudo', constants.RVTYSH_COMMAND, '-c', "show ipv6 bgp summary"])


# 'neighbors' subcommand ("show ipv6 bgp neighbors")
Expand All @@ -34,5 +35,5 @@ def summary():
@click.argument('info_type', type=click.Choice(['routes', 'advertised-routes', 'received-routes']), required=True)
def neighbors(ipaddress, info_type):
"""Show IPv6 BGP neighbors"""
command = 'sudo {} -c "show ipv6 bgp neighbor {} {}"'.format(constants.RVTYSH_COMMAND, ipaddress, info_type)
command = ['sudo', constants.RVTYSH_COMMAND, '-c', "show ipv6 bgp neighbor {} {}".format(ipaddress, info_type)]
run_command(command)
Loading