Skip to content

Commit

Permalink
tests: Adopt some tests to PfxSnt counter
Browse files Browse the repository at this point in the history 
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
  • Loading branch information
@ton31337
ton31337 committed Apr 23, 2020
1 parent 776e7cf commit 1adbf04
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions tests/topotests/all-protocol-startup/r1/show_bgp_ipv6_summary.ref
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ BGP table version 1
RIB entries 1, using XXXX bytes of memory
Peers 2, using XXXX KiB of memory

Neighbor V AS MsgRcvd MsgSent TblVer InQ OutQ Up/Down State/PfxRcd
fc00:0:0:8::1000 4 100 0 0 0 0 0 never Active
fc00:0:0:8::2000 4 200 0 0 0 0 0 never Active
Neighbor V AS MsgRcvd MsgSent TblVer InQ OutQ Up/Down State/PfxRcd PfxSnt
fc00:0:0:8::1000 4 100 0 0 0 0 0 never Active 0
fc00:0:0:8::2000 4 200 0 0 0 0 0 never Active 0
10 changes: 5 additions & 5 deletions tests/topotests/all-protocol-startup/r1/show_ip_bgp_summary.ref
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ BGP table version 1
RIB entries 1, using XXXX bytes of memory
Peers 4, using XXXX KiB of memory

Neighbor V AS MsgRcvd MsgSent TblVer InQ OutQ Up/Down State/PfxRcd
192.168.7.10 4 100 0 0 0 0 0 never Active
192.168.7.20 4 200 0 0 0 0 0 never Active
fc00:0:0:8::1000 4 100 0 0 0 0 0 never Active
fc00:0:0:8::2000 4 200 0 0 0 0 0 never Active
Neighbor V AS MsgRcvd MsgSent TblVer InQ OutQ Up/Down State/PfxRcd PfxSnt
192.168.7.10 4 100 0 0 0 0 0 never Active 0
192.168.7.20 4 200 0 0 0 0 0 never Active 0
fc00:0:0:8::1000 4 100 0 0 0 0 0 never Active 0
fc00:0:0:8::2000 4 200 0 0 0 0 0 never Active 0
14 changes: 7 additions & 7 deletions tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,27 @@
| 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 |
~~~~~~~~~~~~~~~~~~~~~ +----------+
|
| .254
+---------+---------+
| 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 |
+---------+---------+
Expand Down Expand Up @@ -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 -v " 11$"'
'vtysh -c "show ip bgp view %s summary" 2> /dev/null | grep ^[0-9] | grep -vE " 11\s+(\d)$"'
% view
)
if notConverged:
Expand Down

0 comments on commit 1adbf04

Please sign in to comment.