Skip to content

Commit

Permalink
[CLI][show bgp] On chassis don't show internal BGP sessions by default (
Browse files Browse the repository at this point in the history 
#1927)
  • Loading branch information
@smaheshm
smaheshm authored Dec 6, 2021
1 parent 6de91af commit 3fa0854
Show file tree
Hide file tree
Showing 7 changed files with 1,113 additions and 10 deletions.
180 changes: 180 additions & 0 deletions tests/bgp_commands_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@

from click.testing import CliRunner

from utilities_common import multi_asic
from utilities_common import constants

from unittest.mock import patch

from sonic_py_common import device_info
show_bgp_summary_v4 = """\
IPv4 Unicast Summary:
Expand Down Expand Up @@ -91,6 +97,117 @@
Error: bgp summary from bgp container not in json format
"""

show_bgp_summary_v4_chassis = """\
IPv4 Unicast Summary:
BGP router identifier 10.3.147.15, local AS number 65100 vrf-id 0
BGP table version 21464
RIB entries 25783, using 4950336 bytes of memory
Peers 23, using 501768 KiB of memory
Peer groups 3, using 192 bytes of memory
Neighbhor V AS MsgRcvd MsgSent TblVer InQ OutQ Up/Down State/PfxRcd NeighborName
----------- --- ----- --------- --------- -------- ----- ------ --------- -------------- --------------
10.0.0.1 4 65200 4632 11028 0 0 0 00:18:31 8514 ARISTA01T2
10.0.0.9 4 65202 4632 11029 0 0 0 00:18:33 8514 ARISTA05T2
10.0.0.13 4 65203 4632 11028 0 0 0 00:18:33 8514 ARISTA07T2
10.0.0.17 4 65204 4631 11028 0 0 0 00:18:31 8514 ARISTA09T2
10.0.0.21 4 65205 4632 11031 0 0 0 00:18:33 8514 ARISTA11T2
10.0.0.25 4 65206 4632 11031 0 0 0 00:18:33 8514 ARISTA13T2
10.0.0.29 4 65207 4632 11028 0 0 0 00:18:31 8514 ARISTA15T2
10.0.0.33 4 65208 4633 11029 0 0 0 00:18:33 8514 ARISTA01T0
10.0.0.37 4 65210 4632 11028 0 0 0 00:18:32 8514 ARISTA03T0
10.0.0.39 4 65211 4629 6767 0 0 0 00:18:22 8514 ARISTA04T0
10.0.0.41 4 65212 4632 11028 0 0 0 00:18:32 8514 ARISTA05T0
10.0.0.43 4 65213 4629 6767 0 0 0 00:18:23 8514 ARISTA06T0
10.0.0.45 4 65214 4633 11029 0 0 0 00:18:33 8514 ARISTA07T0
10.0.0.47 4 65215 4629 6767 0 0 0 00:18:23 8514 ARISTA08T0
10.0.0.49 4 65216 4633 11029 0 0 0 00:18:35 8514 ARISTA09T0
10.0.0.51 4 65217 4633 11029 0 0 0 00:18:33 8514 ARISTA10T0
10.0.0.53 4 65218 4632 11029 0 0 0 00:18:35 8514 ARISTA11T0
10.0.0.55 4 65219 4632 11029 0 0 0 00:18:33 8514 ARISTA12T0
10.0.0.57 4 65220 4632 11029 0 0 0 00:18:35 8514 ARISTA13T0
10.0.0.59 4 65221 4632 11029 0 0 0 00:18:33 8514 ARISTA14T0
Total number of neighbors 20
"""

show_bgp_summary_v6_chassis = """\
IPv6 Unicast Summary:
BGP router identifier 10.3.147.15, local AS number 65100 vrf-id 0
BGP table version 12971
RIB entries 25783, using 4950336 bytes of memory
Peers 23, using 501768 KiB of memory
Peer groups 3, using 192 bytes of memory
Neighbhor V AS MsgRcvd MsgSent TblVer InQ OutQ Up/Down State/PfxRcd NeighborName
----------- --- ----- --------- --------- -------- ----- ------ --------- -------------- --------------
fc00::1a 4 65203 4438 6578 0 0 0 00:08:57 8514 ARISTA07T2
fc00::2 4 65200 4439 6578 0 0 0 00:08:56 8513 ARISTA01T2
fc00::2a 4 65205 4439 6578 0 0 0 00:08:57 8514 ARISTA11T2
fc00::3a 4 65207 4439 6578 0 0 0 00:08:57 8514 ARISTA15T2
fc00::4a 4 65210 4439 6579 0 0 0 00:08:59 8514 ARISTA03T0
fc00::4e 4 65211 4440 6579 0 0 0 00:09:00 8514 ARISTA04T0
fc00::5a 4 65214 4440 6579 0 0 0 00:09:00 8514 ARISTA07T0
fc00::5e 4 65215 4438 6576 0 0 0 00:08:50 8514 ARISTA08T0
fc00::6a 4 65218 4441 6580 0 0 0 00:09:01 8514 ARISTA11T0
fc00::6e 4 65219 4442 6580 0 0 0 00:09:01 8514 ARISTA12T0
fc00::7a 4 65222 4441 6580 0 0 0 00:09:01 8514 ARISTA15T0
fc00::12 4 65202 4438 6578 0 0 0 00:08:57 8514 ARISTA05T2
fc00::22 4 65204 4438 6578 0 0 0 00:08:57 8514 ARISTA09T2
fc00::32 4 65206 4438 6578 0 0 0 00:08:57 8514 ARISTA13T2
fc00::42 4 65208 4442 6580 0 0 0 00:09:01 8514 ARISTA01T0
fc00::52 4 65212 4439 6579 0 0 0 00:08:59 8514 ARISTA05T0
fc00::56 4 65213 4439 6579 0 0 0 00:08:59 8514 ARISTA06T0
fc00::62 4 65216 4438 6576 0 0 0 00:08:50 8514 ARISTA09T0
fc00::66 4 65217 4442 6580 0 0 0 00:09:01 8514 ARISTA10T0
fc00::72 4 65220 4441 6580 0 0 0 00:09:01 8514 ARISTA13T0
Total number of neighbors 20
"""

show_bgp_summary_v4_all_chassis = """\
IPv4 Unicast Summary:
BGP router identifier 10.3.147.15, local AS number 65100 vrf-id 0
BGP table version 21464
RIB entries 25783, using 4950336 bytes of memory
Peers 23, using 501768 KiB of memory
Peer groups 3, using 192 bytes of memory
Neighbhor V AS MsgRcvd MsgSent TblVer InQ OutQ Up/Down State/PfxRcd NeighborName
----------- --- ----- --------- --------- -------- ----- ------ --------- -------------- ------------------
3.3.3.6 4 65100 0 0 0 0 0 never Connect str2-chassis-lc6-1
3.3.3.7 4 65100 808 178891 0 0 0 00:17:47 1458 str2-chassis-lc7-1
10.0.0.1 4 65200 4632 11028 0 0 0 00:18:31 8514 ARISTA01T2
10.0.0.9 4 65202 4632 11029 0 0 0 00:18:33 8514 ARISTA05T2
10.0.0.13 4 65203 4632 11028 0 0 0 00:18:33 8514 ARISTA07T2
10.0.0.17 4 65204 4631 11028 0 0 0 00:18:31 8514 ARISTA09T2
10.0.0.21 4 65205 4632 11031 0 0 0 00:18:33 8514 ARISTA11T2
10.0.0.25 4 65206 4632 11031 0 0 0 00:18:33 8514 ARISTA13T2
10.0.0.29 4 65207 4632 11028 0 0 0 00:18:31 8514 ARISTA15T2
10.0.0.33 4 65208 4633 11029 0 0 0 00:18:33 8514 ARISTA01T0
10.0.0.37 4 65210 4632 11028 0 0 0 00:18:32 8514 ARISTA03T0
10.0.0.39 4 65211 4629 6767 0 0 0 00:18:22 8514 ARISTA04T0
10.0.0.41 4 65212 4632 11028 0 0 0 00:18:32 8514 ARISTA05T0
10.0.0.43 4 65213 4629 6767 0 0 0 00:18:23 8514 ARISTA06T0
10.0.0.45 4 65214 4633 11029 0 0 0 00:18:33 8514 ARISTA07T0
10.0.0.47 4 65215 4629 6767 0 0 0 00:18:23 8514 ARISTA08T0
10.0.0.49 4 65216 4633 11029 0 0 0 00:18:35 8514 ARISTA09T0
10.0.0.51 4 65217 4633 11029 0 0 0 00:18:33 8514 ARISTA10T0
10.0.0.53 4 65218 4632 11029 0 0 0 00:18:35 8514 ARISTA11T0
10.0.0.55 4 65219 4632 11029 0 0 0 00:18:33 8514 ARISTA12T0
10.0.0.57 4 65220 4632 11029 0 0 0 00:18:35 8514 ARISTA13T0
10.0.0.59 4 65221 4632 11029 0 0 0 00:18:33 8514 ARISTA14T0
10.0.0.61 4 65222 4633 11029 0 0 0 00:18:33 8514 INT_NEIGH0
Total number of neighbors 23
"""


class TestBgpCommands(object):
@classmethod
Expand Down Expand Up @@ -139,3 +256,66 @@ def test_bgp_summary_error(
print("{}".format(result.output))
assert result.exit_code == 2
assert result.output == show_error_invalid_json

def display_external(self):
return constants.DISPLAY_EXTERNAL

def display_all(self):
return constants.DISPLAY_ALL

@pytest.mark.parametrize(
'setup_single_bgp_instance_chassis', ['v4'],
indirect=['setup_single_bgp_instance_chassis']
)
@patch.object(multi_asic.MultiAsic, 'get_display_option', display_external)
@patch('sonic_py_common.device_info.get_platform_info')
def test_bgp_summary_v4_chassis(
self, mock_is_chassis, setup_bgp_commands,
setup_single_bgp_instance_chassis
):
mock_is_chassis.return_value = {'switch_type': 'voq'}
show = setup_bgp_commands
runner = CliRunner()
result = runner.invoke(
show.cli.commands["ip"].commands["bgp"].commands["summary"], [])
print("{}".format(result.output))
assert result.exit_code == 0
assert result.output == show_bgp_summary_v4_chassis

@pytest.mark.parametrize(
'setup_single_bgp_instance_chassis', ['v6'],
indirect=['setup_single_bgp_instance_chassis']
)
@patch.object(multi_asic.MultiAsic, 'get_display_option', display_external)
@patch('sonic_py_common.device_info.get_platform_info')
def test_bgp_summary_v6_chassis(
self, mock_is_chassis, setup_bgp_commands,
setup_single_bgp_instance_chassis
):
mock_is_chassis.return_value = {'switch_type': 'voq'}
show = setup_bgp_commands
runner = CliRunner()
result = runner.invoke(
show.cli.commands["ipv6"].commands["bgp"].commands["summary"], [])
print("{}".format(result.output))
assert result.exit_code == 0
assert result.output == show_bgp_summary_v6_chassis

@pytest.mark.parametrize(
'setup_single_bgp_instance_chassis', ['v4'],
indirect=['setup_single_bgp_instance_chassis']
)
@patch.object(multi_asic.MultiAsic, 'get_display_option', display_all)
@patch('sonic_py_common.device_info.get_platform_info')
def test_bgp_summary_v4_all_chassis(
self, mock_is_chassis, setup_bgp_commands,
setup_single_bgp_instance_chassis
):
mock_is_chassis.return_value = {'switch_type': 'voq'}
show = setup_bgp_commands
runner = CliRunner()
result = runner.invoke(
show.cli.commands["ip"].commands["bgp"].commands["summary"], [])
print("{}".format(result.output))
assert result.exit_code == 0
assert result.output == show_bgp_summary_v4_all_chassis
32 changes: 28 additions & 4 deletions tests/conftest.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import sys
from unittest import mock


import pytest
from sonic_py_common import device_info, multi_asic
from swsscommon.swsscommon import ConfigDBConnector
Expand Down Expand Up @@ -126,12 +125,37 @@ def setup_multi_broadcom_masic():
multi_asic.is_multi_asic= mock.MagicMock(return_value=False)


@pytest.fixture
def setup_single_bgp_instance_chassis(request):
import utilities_common.bgp_util as bgp_util

def mock_show_bgp_summary(
vtysh_cmd, bgp_namespace, vtysh_shell_cmd=constants.RVTYSH_COMMAND
):
if os.path.isfile(bgp_mocked_json):
with open(bgp_mocked_json) as json_data:
mock_frr_data = json_data.read()
return mock_frr_data
return ""

if request.param == 'v4':
bgp_mocked_json = os.path.join(
test_path, 'mock_tables', 'ipv4_bgp_summary_chassis.json')
elif request.param == 'v6':
bgp_mocked_json = os.path.join(
test_path, 'mock_tables', 'ipv6_bgp_summary_chassis.json')

bgp_util.run_bgp_command = mock.MagicMock(
return_value=mock_show_bgp_summary("", ""))


@pytest.fixture
def setup_t1_topo():
dbconnector.topo = "t1"
yield
dbconnector.topo = None


@pytest.fixture
def setup_single_bgp_instance(request):
import utilities_common.bgp_util as bgp_util
Expand All @@ -151,7 +175,7 @@ def mock_show_bgp_summary(vtysh_cmd, bgp_namespace, vtysh_shell_cmd=constants.RV
mock_frr_data = json_data.read()
return mock_frr_data
return ""

def mock_run_bgp_command_for_static(vtysh_cmd, bgp_namespace="", vtysh_shell_cmd=constants.RVTYSH_COMMAND):
if vtysh_cmd == "show ip route vrf all static":
return config_int_ip_common.show_ip_route_with_static_expected_output
Expand All @@ -176,7 +200,7 @@ def mock_run_show_ip_route_commands(request):
else:
return ""


if any ([request.param == 'ipv6_route_err', request.param == 'ip_route',\
request.param == 'ip_specific_route', request.param == 'ip_special_route',\
request.param == 'ipv6_route', request.param == 'ipv6_specific_route']):
Expand Down Expand Up @@ -248,7 +272,7 @@ def mock_run_bgp_command(vtysh_cmd, bgp_namespace, vtysh_shell_cmd=constants.RVT
if m_asic_json_file.startswith('bgp_v4_network') or \
m_asic_json_file.startswith('bgp_v6_network'):
return mock_show_bgp_network_multi_asic(m_asic_json_file)

if m_asic_json_file.startswith('bgp_v4_neighbor') or \
m_asic_json_file.startswith('bgp_v6_neighbor'):
return mock_show_bgp_neighbor_multi_asic(m_asic_json_file, bgp_namespace)
Expand Down
20 changes: 20 additions & 0 deletions tests/mock_tables/config_db.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1533,6 +1533,26 @@
"nhopself": "0",
"rrclient": "0"
},
"BGP_VOQ_CHASSIS_NEIGHBOR|3.3.3.6": {
"admin_status": "up",
"asn": "65100",
"holdtime": "0",
"keepalive": "0",
"local_addr": "3.3.3.3",
"name": "str2-chassis-lc6-1",
"nhopself": "0",
"rrclient": "0"
},
"BGP_VOQ_CHASSIS_NEIGHBOR|3.3.3.7": {
"admin_status": "up",
"asn": "65100",
"holdtime": "0",
"keepalive": "0",
"local_addr": "3.3.3.3",
"name": "str2-chassis-lc7-1",
"nhopself": "0",
"rrclient": "0"
},
"FLEX_COUNTER_TABLE|QUEUE": {
"POLL_INTERVAL": "10000",
"FLEX_COUNTER_STATUS": "enable"
Expand Down
Loading

0 comments on commit 3fa0854

Please sign in to comment.