summaryrefslogtreecommitdiffstats
path: root/tests/topotests/bgp_multiview_topo1
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas.abraitis@gmail.com>2020-04-24 09:00:17 +0200
committerDonatas Abraitis <donatas.abraitis@gmail.com>2020-04-24 09:00:17 +0200
commit3525e233887f23c47f1bc890f374ce64e45ebbee (patch)
tree79aa1a7def3eadc711549e9b0e81a773ca5fa569 /tests/topotests/bgp_multiview_topo1
parentRevert "bgpd: Show PfxSnt for `show bgp <afi> <safi>` command" (diff)
downloadfrr-3525e233887f23c47f1bc890f374ce64e45ebbee.tar.xz
frr-3525e233887f23c47f1bc890f374ce64e45ebbee.zip
Revert "tests: Adopt some tests to PfxSnt counter"
This reverts commit 6e0f90413ef43a154d84ff62bd04eb49366683a0.
Diffstat (limited to 'tests/topotests/bgp_multiview_topo1')
-rwxr-xr-xtests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py b/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py
index a2020ffa5..c342b17dd 100755
--- a/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py
+++ b/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py
@@ -29,19 +29,19 @@ test_bgp_multiview_topo1.py: Simple Quagga/FRR Route-Server Test
| peer1 | | peer2 | | peer3 | | peer4 | | peer5 |
| AS 65001 | | AS 65002 | | AS 65003 | | AS 65004 | | AS 65005 |
+-----+----+ +-----+----+ +-----+----+ +-----+----+ +-----+----+
- | .1 | .2 | .3 | .4 | .5
+ | .1 | .2 | .3 | .4 | .5
| ______/ / / _________/
- \ / ________________/ / /
- | | / _________________________/ / +----------+
+ \ / ________________/ / /
+ | | / _________________________/ / +----------+
| | | / __________________________/ ___| peer6 |
| | | | / ____________________________/.6 | AS 65006 |
| | | | | / _________________________ +----------+
- | | | | | | / __________________ \ +----------+
+ | | | | | | / __________________ \ +----------+
| | | | | | | / \ \___| peer7 |
| | | | | | | | \ .7 | AS 65007 |
~~~~~~~~~~~~~~~~~~~~~ \ +----------+
~~ SW1 ~~ \ +----------+
- ~~ Switch ~~ \_____| peer8 |
+ ~~ Switch ~~ \_____| peer8 |
~~ 172.16.1.0/24 ~~ .8 | AS 65008 |
~~~~~~~~~~~~~~~~~~~~~ +----------+
|
@@ -49,7 +49,7 @@ test_bgp_multiview_topo1.py: Simple Quagga/FRR Route-Server Test
+---------+---------+
| FRR R1 |
| BGP Multi-View |
- | Peer 1-3 > View 1 |
+ | Peer 1-3 > View 1 |
| Peer 4-5 > View 2 |
| Peer 6-8 > View 3 |
+---------+---------+
@@ -226,7 +226,7 @@ def test_bgp_converge():
for i in range(1, 2):
for view in range(1, 4):
notConverged = net["r%s" % i].cmd(
- 'vtysh -c "show ip bgp view %s summary" 2> /dev/null | grep ^[0-9] | grep -vP " 11\s+(\d+)$"'
+ 'vtysh -c "show ip bgp view %s summary" 2> /dev/null | grep ^[0-9] | grep -v " 11$"'
% view
)
if notConverged: