proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-03 01:32:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
15,858 Commits 4 Branches 191 Tags 125 MiB
a90edf08e3
Commit Graph

836 Commits

Author SHA1 Message Date
Quentin Young
dadd89e672 update ref file for cidr mask display 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2018-11-27 20:22:14 -05:00
Lou Berger
c49edeb452 bgp_l3vpn_to_bgp_vrf: allow for long adjancies, seen with l3mdev_accept=1 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:14 -05:00
Lou Berger
a945bf0777 bgp_l3vpn_to_bgp_vrf: ignore output of sysctl, reenables test! 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:14 -05:00
Lou Berger
af01532c45 lib: speedup test exit when startup fails 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:14 -05:00
Rafael Zalamena
96984a17a5 ldp-vpls-topo1: remove duplicated code and sleep 
Use the new standardized code for router output compare and remove a
code sleep.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:14 -05:00
Philippe Guibert
224737467e ospf-topo1-vrf: replace link_enable api with zebra topotest api 
Because on some platforms like i386, 'ip netns ' commands are unstable,
then I use an other API to operate the shutdown/no shutdown operation by
using vtysh.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2018-11-27 20:22:14 -05:00
Philippe Guibert
f561216813 lib: add zebra api to shutdown an interface 
this function operates on vtysh, and performs a shutdown on an
interface.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2018-11-27 20:22:14 -05:00
Philippe Guibert
918138769c ospf-topo1-vrf: replace ip_route method with ip_route_zebra 
To analyse which route has been entered in the kernel, the
 zebra show ip route vrf command is used.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2018-11-27 20:22:14 -05:00
Philippe Guibert
b220b3c83a lib: add ip_route_zebra function 
This command permits dumping zebra routes from a vrf

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2018-11-27 20:22:14 -05:00
Philippe Guibert
35490676eb ospf-topo1-vrf: setup with OSPF VRF 
OSPF test with VRF backend NETNS

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2018-11-27 20:22:14 -05:00
Philippe Guibert
0ab7733f7f lib: topogen support for link_enable on other netns 
In the case where vrf backend is based on NETNS, the link enable command
switches from context so as to perform the command.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2018-11-27 20:22:14 -05:00
Rafael Zalamena
e3060696ef bgp_vrf_netns: reduce code duplication 
Use new standardized functions to reduce code duplication.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:14 -05:00
Rafael Zalamena
ab4d1656b5 bgp-ecmp-topo1: remove sleep and reduce code 
Use new standardized code to test router output and remove the
convergence sleep.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:14 -05:00
Rafael Zalamena
38b291bca0 ospf-topo1: use new output compare functions 
Remove duplicated code and use the new output compare code from
lib.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:14 -05:00
Rafael Zalamena
9e2201b8aa isis-topo1: use run_and_expect 
Use `run_and_expect` instead of manually implementing this code in the
test.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:14 -05:00
Rafael Zalamena
5cffda1882 lib: implement standardized compare functions 
In a effort to migrate more tests to use `run_and_expect` instead of
`sleep`s, this commit imports some common functions used to compare
router output. Retrying output comparison for N times, instead of
relying on arbitrary code `sleep`s, should help CI system tests fail
less and possibly run for less time.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:14 -05:00
Rafael Zalamena
9683a1bb50 lib: improve normalize_text with another case 
When normalizing a text also remove trailing whitespace since external
tools might add them. This commit fixes a test failure in ospf_topo1 on
Ubuntu 18.04.1.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:14 -05:00
Rafael Zalamena
fd8582906d lib: show run_and_expect spent time 
Standardize run_and_expect to show start and end time along with maximum
estimated wait time.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:14 -05:00
Lou Berger
064c807f63 bgp_l3vpn_to_bgp_direct: imports and more debug Allow for different timings on, and number of, import processing Collect more info for debugging 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:14 -05:00
Lou Berger
f8d5215d82 bgp_l3vpn_to_bgp_vrf: use l3mdev_accept workaround for known kernel bug 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:14 -05:00
Rafael Zalamena
62accdecd8 isis-topo1: fix IPv6 changes and remove metric 
IPv6 metric for FRR version <3.X is different than for newer versions,
so to avoid extra code logic lets just ignore these checks.

The IPv6 changes weren't detected earlier because of the json_cmp list
fix.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:14 -05:00
Rafael Zalamena
ae6be66b8c isis-topo1: remove pseudo_TE-IS entries from check 
The pseudo_TE-IS entries vary and depend on the way the topology
converges, so lets not rely on that.

The IS-IS routers in the middle TE-IS entries vary the parent
interface, so we also removed that entry to avoid json_cmp comparison
failures.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:14 -05:00
Rafael Zalamena
16b3114108 isis-topo1: improve topology parser 
Don't match header otherwise it will create an even bigger JSON output
than we need.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:14 -05:00
Rafael Zalamena
3e379f6e49 topotests: fix json_cmp wrong list handling 
Don't quit on the first match. While here add some more `json_cmp` tests
to make sure this doesn't happen again.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:14 -05:00
Rafael Zalamena
a82e5f9a7f lib: improve json_cmp 
Allow json_cmp to compare JSON values which begin with a list instead of
a dictionary.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:14 -05:00
Rafael Zalamena
5a2f1e6fbe *: ignore .pytest_cache directories 
These folders are being generated by recent py.test versions and should
be ignored.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:14 -05:00
Christian Franke
f2d6ce41ca lib: check presence of mpls modules, not exitcode of modprobe 
Signed-off-by: Christian Franke <nobody@nowhere.ws>
 2018-11-27 20:22:14 -05:00
Mark Stapp
cf38bed97a isis-topo1: make isis topology match .dot file 
The v6 isis topology didn't really match the illustration. Fix
the configs and the test expectations so that all the parts
agree.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
 2018-11-27 20:22:14 -05:00
Philippe Guibert
4b1f7a62db bgp_vrf_netns: swap the order of netns destruction 
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2018-11-27 20:22:14 -05:00
Martin Winter
2c805e6cf6 lib: Fix staticd extension 
Do not provide a staticd.conf to force staticd to read it's config
from zebra.conf

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2018-11-27 20:22:14 -05:00
Martin Winter
a2a1134c77 lib: Add support for staticd 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2018-11-27 20:22:14 -05:00
Lou Berger
160ce66a28 bgp_l3vpn_to_bgp_vrf: allow some time for updates to propogate 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:14 -05:00
Lou Berger
ffd3f54493 lib: more logging to aid in failure debugging 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:14 -05:00
Lou Berger
dce382d4a9 lib: don't report cores on exit as asserts in 5.0 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:14 -05:00
Lou Berger
436aa319bc lib: don't assert on shutdown errors in rel < 5.0 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:14 -05:00
Lou Berger
fb80b81b26 lib: add and use Router.checkRouterVersion (based on bdpd version) 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:14 -05:00
Lou Berger
95460a6b7e lib: collect and report shutdown errors across whole topology 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:14 -05:00
Lou Berger
83c26937f4 lib: collect shutdown errors, add assert on single router shutdown 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:14 -05:00
Rafael Zalamena
edc7a5036c ldp-topo1: fix ip mpls route output format 
Remove the different file as it is no longer needed.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:14 -05:00
Christian Franke
5c4e963e40 ospf6-topo1: make ip-route comparison more robust 
Signed-off-by: Christian Franke <nobody@nowhere.ws>
 2018-11-27 20:22:14 -05:00
Christian Franke
3a103f9a46 ldp-topo1: fix parsing for iproute from Ubuntu 18.04 
Signed-off-by: Christian Franke <nobody@nowhere.ws>
 2018-11-27 20:22:14 -05:00
Lou Berger
6c700097d6 lib: bgprib - get human readable verson of json commands for log 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:14 -05:00
Lou Berger
b0f0d980b5 lib: allow all rw access to /tmp/topotests (for package support and debug) 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:14 -05:00
Lou Berger
da63d5b319 lib: use per node log directory when topotest is used without topogen 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:14 -05:00
Lou Berger
deb4cef09a lib: log to start/local (per node) dir, log commands 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:14 -05:00
Lou Berger
93701fcf98 GUIDELINES.md: update to reflect per node log dirs 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:14 -05:00
Lou Berger
2b0e32967c *: convert startup logs to use per node directories also have startup and running log files match 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:14 -05:00
Lou Berger
2a59a86b50 lib: limit checkRouterCores output to once per router start 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:14 -05:00
Donald Sharp
d3335443bf bgp_l3vpn_to_bgp_vrf: Fixup topo test to write log files to same location at start of run 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2018-11-27 20:22:14 -05:00
Lou Berger
f76774ec9d lib: add check for core and memory issues after routerstop 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:14 -05:00
Lou Berger
e1dfa45e1b lib: convert to directories per node 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:14 -05:00
Lou Berger
068df8819b bgp_l3vpn_to_bgp_vrf: more pings... 2018-11-27 20:22:14 -05:00
Lou Berger
e8540bcb55 bgp_l3vpn_to_bgp_vrf: fix wrong table entries 2018-11-27 20:22:14 -05:00
Lou Berger
c941311fef lib: lutil - fix test numbering, add test number to command logging 2018-11-27 20:22:14 -05:00
Lou Berger
8e1bb0b707 bgp_l3vpn_to_bgp_vrf: remote static routes left over from old test versions 2018-11-27 20:22:14 -05:00
G. Paul Ziemba
3675bf4222 bgp_multiview_topo1: more fixes for header changes of PR 2045 
For this test, vrf id in headers is unset

Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2018-11-27 20:22:14 -05:00
G. Paul Ziemba
6a57e10314 bgp: tolerate route-table-show header changes of PR 2045 
The table header has changed slightly for "bgp show" commands. Change
all-protocol-startup (test_bgp_ipv4() and test_bgp_ipv6()) and
bgp_multiview_topo1 (test_bgp_routingTable())  to run diffs against multiple
templates (representing the various valid outputs for different versions
of the FRR code) and mark the test "passed" if any one template matches.

Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2018-11-27 20:22:13 -05:00
G. Paul Ziemba
e4992f04e0 bgp_l3vpn_to_bgp_vrf: use FRR PR #2053 
Check CE routes from CE in another VRF attached to same PE router. Relies
on FRR bug fix to not require labeled nexthop for paths that go only
through PE router and not mpls core.

Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2018-11-27 20:22:13 -05:00
G. Paul Ziemba
8651b9e617 bgp_l3vpn_to_bgp_vrf: check_linux_mpls: delete obsolete code; formatting 
Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
518874f48a lib: fix path the led to group_nl_converted being referenced when not set 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
G. Paul Ziemba
d521440020 lib/bgprib.py: add copyright notice 
Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2018-11-27 20:22:13 -05:00
G. Paul Ziemba
c63906e8cf lib: lutil matching without changing newlines 
Prior behavior of luCommand was to convert newlines to spaces in DUT
output before pattern matching. New method operating in parallel uses
re.DOTALL to mimic same behavior and allow preserving original DUT output.
The original output is needed for some scripts that parse line-by-line.

There is also some test code to compare match results using the
old way and new way and log a message if they are different. After
some short time we can develop confidence that using this new method
will not break any existing tests.

Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2018-11-27 20:22:13 -05:00
G. Paul Ziemba
d86321ae94 bgp_l3vpn_to_bgp_vrf: require frr 4.1 
Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2018-11-27 20:22:13 -05:00
G. Paul Ziemba
52a77b80e4 bgp_l3vpn_to_bgp_vrf: update to current vpn-vrf leak syntax and behavior 
Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2018-11-27 20:22:13 -05:00
G. Paul Ziemba
587e28a4f0 lib/bgprib.py: handle empty json results gracefully 
Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2018-11-27 20:22:13 -05:00
G. Paul Ziemba
90d56c6cca lib/ltemplate.py: add KeepGoing parameter to ltemplateTest 
Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2018-11-27 20:22:13 -05:00
G. Paul Ziemba
19246819f4 test_bgp_l3vpn_to_bgp_vrf: match new nexthop=0 code 
Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2018-11-27 20:22:13 -05:00
G. Paul Ziemba
22b888017c test_bgp_l3vpn_to_bgp_vrf: small config comment cleanup 
Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2018-11-27 20:22:13 -05:00
G. Paul Ziemba
7fdc42389a ltemplate.py: start isisd when isisd.conf present 
Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2018-11-27 20:22:13 -05:00
G. Paul Ziemba
09da03d50d ltemplate.py: remove dependency on hard-coded router name r2 
Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2018-11-27 20:22:13 -05:00
G. Paul Ziemba
1630ad4695 bgp_l3vpn_to_bgp_vrf: assign different RDs to customers on r4 
Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2018-11-27 20:22:13 -05:00
G. Paul Ziemba
38770d3c9d bgp_l3vpn_to_bgp_vrf: comment out route-add commands no longer needed 
Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2018-11-27 20:22:13 -05:00
G. Paul Ziemba
953858275e bgp_l3vpn_to_bgp_vrf: check_routes test now uses bgprib for exact route checking 
Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2018-11-27 20:22:13 -05:00
G. Paul Ziemba
044e2a3119 lib/bgprib.py naming rib->bgprib is more accurate 
Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2018-11-27 20:22:13 -05:00
G. Paul Ziemba
b7addc48d3 bgp_l3vpn_to_bgp_vrf: updated config files to current vpn-policy syntax 
Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2018-11-27 20:22:13 -05:00
G. Paul Ziemba
f7af60f202 lutil: expose result method 
Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2018-11-27 20:22:13 -05:00
G. Paul Ziemba
8a28936d41 lib: bgprib utility to compare rib against list of required routes 
Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2018-11-27 20:22:13 -05:00
G. Paul Ziemba
9c8eda68e9 bgp vpn-vrf leaking: partial changes toward using new functionality 
Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2018-11-27 20:22:13 -05:00
Philippe Guibert
1c2bcf650f bgp_vrf_netns: revert changes from topotest 77 
revert
https://github.com/FRRouting/topotests/pull/77
bgp_vrf_netns: do not run test on 32 bit linux machines

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2018-11-27 20:22:13 -05:00
Philippe Guibert
505fc1bedf bgp_vrf_netns: increase bgp convergence timer 
BGP convergence timer is increased from 90 seconds to 120 seconds.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2018-11-27 20:22:13 -05:00
Philippe Guibert
e0fac6ad5e bgp_vrf_netns: do not run test on 32 bit linux machines 
It seems vrf netns is not working on 32 bit platforsm.
For that, the test should be cancelled.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2018-11-27 20:22:13 -05:00
Lou Berger
4072a15323 bgp_vrf_netns: attempt cleanup of previous test abnormal exit. skip test if setup fails 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
87d5e16a45 lib: TopoExaBGP.start - report unexpected exabgp output 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
1cb051708d bgp_vrf_netns: allow more time for adjacency to come up, report unexpected output 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Philippe Guibert
12919c4255 bgp_vrf_netns: add basic test to support netns backend with netns 
The test consist in starting a BGP router on a NETNS, and interacting
with an exaBGP instance. The test automatically relies on VRF with netns
backend but can be easily configured so as to perform basic BGP VRF
testing with VRF with VRF-lite backend.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2018-11-27 20:22:13 -05:00
Philippe Guibert
8dd5077d81 lib: zebra support for vrfwnetns parameter 
topotest library is being added a new parameter when preparing the
configurationof each daemon. This parameter will be used to call the
daemon with some extra parameters. The -n parameter for zebra is taken
into account.
Also, when a extra parameter is given for calling zebra, a check is done to
see if it is possible to run zebra daemon with that option. This is the
case for vrfwnetns option. If not available, an error message is sent
back.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2018-11-27 20:22:13 -05:00
Lou Berger
14314036ca bgp_l3vpn_to_bgp_vrf: fix route set on non-vrf interface (thanks ben!) 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
cc3cf6a883 lib: lutil - fix test counting, add returnJson flag 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Rafael Zalamena
623afc9d83 ldp-vpls-topo1: support new OSPF JSON format 
Support the new OSPF JSON output format for `show ip ospf neighbor
json` introduced in FRR's PR 1723.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:13 -05:00
Martin Winter
e1e048002d Revert previous 2 commits (pushed by mistake) 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2018-11-27 20:22:13 -05:00
Olivier Dugeon
0c9274877a Update OSPF-SR tests to handle various version 
In order to avoid failed test on unsupported version:
 - Test that version is greater than 4
 - Check that Segment Routing CLI are available

Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
 2018-11-27 20:22:13 -05:00
Olivier Dugeon
a60948db9c Add OSPF Segment Routing tests 
- Build a topology made of 4 routers: 3 PE connected to a P
 - Segment Routing is activated on all 4 routers with various setting
for the MSD, Global Block and Prefix (with or without NO-PHP flag)
 - 2 tests have been elaborated: the first one check the consistency of the
Segment Routing database on each router compared to a reference and the second
one check that the MPLS FIB has been correctly configured on each router,
again compared to a reference

Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
 2018-11-27 20:22:13 -05:00
Martin Winter
d01e89f168 ldp-topo1: Support implicit-null and old format on "show_mpls_table" 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2018-11-27 20:22:13 -05:00
Lou Berger
a209417da6 bgp_l3vpn_to_bgp_direct: use new ltemplate common functions 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
98a1523fc8 bgp_l3vpn_to_bgp_vrf: use new ltemplate common functions 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
89b9abd97e lib: ltemplate add common ltemplateRtrCmd and ltemplateVersionCheck 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
1e21dc870d bgp_l3vpn_to_bgp_vrf: centralize iproute2 check, add checks to appropriate tests 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
a1a359ad8d bgp_l3vpn_to_bgp_vrf: required 4.11 kernel on arm processors 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
a0cbe75d20 bgp_l3vpn_to_bgp_vrf: add test to check linux vrf info 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
6198913449 bgp_l3vpn_to_bgp_vrf: prepend rtr name to vrf name, per Philippe 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
4a17413709 bgp_l3vpn_to_bgp_vrf: skip mpls vrf ping tests when have old iproute2 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
e766417ec9 bgp_l3vpn_to_bgp_vrf: add testing for manually setup MPLS path (until have dynamic) 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
cf469a232b isis-topo1: allow up to 90 sec for convergence 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
d868d685e3 bgp_l3vpn_to_bgp_direct: use tgen.hasmpls flag 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
f2f902aca8 bgp_l3vpn_to_bgp_vrf: catch linux setup failures 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
d1f82d97db bgp_l3vpn_to_bgp_vrf: collect iproute2 package into 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
6dd81dbbfe bgp_l3vpn_to_bgp_vrf: add kernel check (>=4.9) 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
1c507d27e3 bgp_l3vpn_to_bgp_vrf: use tgen.hasmpls flag 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
9711fc7e0b lib: add tgen level mpls init and hasmpls flag 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
85c81f9540 bgp_l3vpn_to_bgp_vrf: 2nd try at skipping tests when MPLS not available 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
2015a49715 bgp_l3vpn_to_bgp_vrf: skip tests when mpls not available 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
4348027f3e lib: add script name to summary output 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
66c5287ec0 lib: add luLast to get last found luCommand regex match 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
8d99289694 bgp_l3vpn_to_bgp_direct: allow for some ping loss 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
f0287609c5 bgp_l3vpn_to_bgp_vrf: allow for some ping loss 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
c0c1496c62 bgp_l3vpn_to_bgp_vrf: add basic data path checks prior to adjacency check 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
0bd1c31f5b bgp_l3vpn_to_bgp_direct: add basic data path checks prior to adjacency check 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
340ecf297e bgp_l3vpn_to_bgp_xxx: match ltemplate start/stop changes 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
850de337d9 lib: ltemplate simplify start/stop 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
d0c5acabb9 bgp_l3vpn_to_bgp_xxx: avoid collision of customize.py match lutil and ltemplate changes 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
9e219b9af7 lib: scope life of Lutil and _lt to a single test run reorg to support regression environment 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
b9ff36bed7 bgp_l3vpn_to_bgp_vrf: just test adjacencies now - for dev/integration 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
308ae0773f bgp_l3vpn_to_bgp_vrf: don't set vrf-policy, wait for new format 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
856b9cce2d bgp_l3vpn_to_bgp_vrf: add ce4 off of r4 for inter-vrf route leaking 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
c0ace6d8e1 bgp_l3vpn_to_bgp_vrf: in progress version Adjacenies up, MPLS configured on interfaces -- right now provides testbed for code changes 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
4ac1e79fbc bgp_l3vpn_to_bgp_vrf: clone bgp_l3vpn_to_bgp_direct as starting point 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
99f5f0350b bgp_l3vpn_to_bgp_direct: 2nd try at skipping tests when MPLS not available 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
9ed0809e49 bgp_l3vpn_to_bgp_direct: skip tests when mpls not available 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
447f2d5a16 lib: add router.has_mpls check 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Rafael Zalamena
46325763aa topogen: fix assertion on routers_have_failure 
`errors != ''` is never going to be false so the assert was never being
triggered.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:13 -05:00
Rafael Zalamena
0e17ee9e03 topogen: import pytest assert function 
Use the pytest assert function to be able to report to pytest failures
that happened inside the API.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:13 -05:00
Rafael Zalamena
d4368260c3 isis-topo1: check IPv6 linux route install 
Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:13 -05:00
Rafael Zalamena
d43cd0fd62 isis-topo1: simplify dictionary key removal code 
Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:13 -05:00
Rafael Zalamena
88f83773d9 isis-topo1: check ipv6 zebra route installation 
Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:13 -05:00
Rafael Zalamena
fc7752c118 isis-topo1: skip test on FRR 2.0 
It was noticed that this topology doesn't converge when there are IPv6
configurations, so this commit makes the tests to be skipped when the
version is 2.X.Y.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org
 2018-11-27 20:22:13 -05:00
Rafael Zalamena
5836fac223 isis-topo1: add IPv6 ISIS topology test 
Configure IPv6 addresses and ISIS distribution, then test the topology
for the newly configured addresses.

This commit also adds support for parsing IPv6 data from the ISIS
topology output while updating the routers topology JSON files.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:13 -05:00
Rafael Zalamena
29614f56c5 isis-topo1: add support for stable versions 
Allow isis-topo1 tests to run on stable versions (2.0.2 and 3.0.2).

There are two differences between the stable versions and master:
1. ISIS nexthops don't show interfaceName nor interfaceIndex
   (on 'show ip route json')
2. New FRR version install ISIS routes in Linux with a different proto
   type identification.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:13 -05:00
Rafael Zalamena
2d013cdabc isis-topo1: check ISIS kernel route installation 
Check if the ISIS learned routes are being installed in the underlying
OS.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:13 -05:00
Rafael Zalamena
e4d08d5be7 isis-topo1: test ISIS route installation 
Check the 'show ip route json' output for installed ISIS routes.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:13 -05:00
Rafael Zalamena
67f1e9ed09 isis-topo1: test ISIS topology convergence 
Add function to parse 'show isis topology' and expect the correct
convergence result.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:13 -05:00
Rafael Zalamena
74bd8dd9ba isis-topo1: add topology graph 
Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:13 -05:00
Rafael Zalamena
3aefe20797 isis-topo1: import topology 
Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:13 -05:00
Martin Winter
4649eef8e1 ldp-vpls-topo1: new format for ospf neighbor json 
Accept new format in ospf neighbor json output in addition to
old version. New format was introduced with PR1659

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2018-11-27 20:22:13 -05:00
Lou Berger
8ab91133c7 lib: ltemplate - fix handling of CallOnFail (take 2) 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
5859c4be6b lib: ltemplate - fix handling of CallOnFail 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
3eff4cc9dd bgp_l3vpn_to_bgp_direct: fix hook routines for ltemplate 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
2eddcd9ff3 bgp_l3vpn_to_bgp_direct: rename bgp_direct_to_bgp_vpn Rename BGP L3VPN test to have L3VPN at start of test name Also remove unused/pre-ltemplate files 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
c30e3e40a6 bgp_direct_to_bgp_vpn: enable mpls forwarding, add more details on adjacencies 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
db2dbd246e bgp_direct_to_bgp_vpn: convert to lib/ltemplate 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:13 -05:00
Lou Berger
df437d254a lib: add LabN testing template 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:12 -05:00
Martin Winter
d75f5f94cd ospf-topo1: Allow IPv6 ECMP version to pass 
Check ospf IPv6 routes for ECMP version first and fallback
to previous version if needed.

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2018-11-27 20:22:12 -05:00
Martin Winter
a1f1550fc2 ospf-topo1: Add IPv6 addresses to diagram 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2018-11-27 20:22:12 -05:00
Lou Berger
50b15737c9 lib: lutil - make it easier to spot command output and null output 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:12 -05:00
Lou Berger
2fdcc34250 lib: lutil - make requested error logging change 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:12 -05:00
Lou Berger
bd15005d3a bgp_direct_to_bgp_vpn: scripts - avoid race condition, and test for predicable results 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:12 -05:00
Lou Berger
ffdac4dbd8 bgp_direct_to_bgp_vpn: add some progress output 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:12 -05:00
Lou Berger
e437365bb9 bgp_direct_to_bgp_vpn: general cleanup use moved lutil.py improve error information adjust to new luCommand default timeout sdd support for CliOnFail, remove no_test_call_mininet_cli scripts - update to correct stable values use topo test's log dir 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:12 -05:00
Lou Berger
a582a8e9c5 lib: lutil cleanup move utilities/lutil.py -> lib/lutil.py add: luShowFail, CallOnFail, luStart parameter to set log dir change default wait to 10sec 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:12 -05:00
Lou Berger
7ed102b925 bgp_direct_to_bgp_vpn: convert to new template, skip tests on pre-3.1 versions 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:12 -05:00
Lou Berger
6d0dbb7996 bgp_direct_to_bgp_vpn: initial version 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:12 -05:00
Lou Berger
199a7c79c1 lutil: initial version 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:12 -05:00
Rafael Zalamena
e600b2d93c topotest: remove pid files 
Remove PID files after a SIGKILL or confirmation that the pid file no
longer contains a running PID.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:12 -05:00
Rafael Zalamena
065bd557f8 topotest: improve informational messages 
Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:12 -05:00
Rafael Zalamena
63038f4b02 topotest: show the user that we are waiting 
Add a log message to tell the user that we are waiting for zebra.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
 2018-11-27 20:22:12 -05:00
Lou Berger
3a568b9ca6 lib: speed up router shutdown stopRouter: report when a process is being killed only sleep if actually killed a process add option to not sleep or conduct -7 kill topogen stop: add wait parameter (defaults to old/wait) when stopping routers, first stop all without waiting then do a second pass where will wait if needed 
Signed-off-by: Lou Berger <lberger@labn.net>
 2018-11-27 20:22:12 -05:00
Rafael Zalamena
08533b7bce topotest: always show diff on json_cmp failure 
Append diffs on all json_cmp failures so the reader can compare JSON
field differences.
 2018-11-27 20:22:12 -05:00
Rafael Zalamena
479b98aacd topotest: specify why we are waiting 
This shows the user why the router teardown is taking 2 seconds long.
 2018-11-27 20:22:12 -05:00
Rafael Zalamena
28a9b4f56e doc: update README and add code snippets 
Add some pointers in the README documentation that might help users get
ready to use topotest.
 2018-11-27 20:22:12 -05:00
Rafael Zalamena
222ea88b2a topotest/topogen: demote some messages level 
The messages level of this commit were downgraded because some of them
happen on 'non-error' situations. This should help diminish the error
log verbosity on the CI-system run.
 2018-11-27 20:22:12 -05:00
Rafael Zalamena
034237db12 topotest: fix a regression in version_cmp 
It was found a regression on an edge case when the second number in the
comparison was (at least) 2 numbers longer the comparison would fail
with a wrong return value. It succeeded for some cases because the
first comparison in the exception was correct, but not the second.
 2018-11-27 20:22:12 -05:00
Martin Winter
a018893f7c bgp-ecmp-topo1: Workaround for version check 
temp workaround for Issue #43

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2018-11-27 20:22:12 -05:00
Martin Winter
3d6c6f01ac ldp-vpls-topo1: Allow ospf neighbor json command with list (new) and dict (old) 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2018-11-27 20:22:12 -05:00
Rafael Zalamena
968afc2848 ldp-vpls-topo1: fix a json_cmp result assert 
Use the 'right' assert to show more detailed failure report and remove
a unused variable.
 2018-11-27 20:22:12 -05:00
Martin Winter
dd3ddc0663 Fix output to allow it on generic Debian 
- Generic Debian only has a single space in front of “proto” in the linux shell routing outptu

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2018-11-27 20:22:12 -05:00
Rafael Zalamena
7c1f9631fc eigrp-topo1: solve output ordering problem 
Transform 'show ip eigrp topo' output into data structures and compare
using json_cmp() to avoid expecting output order.
 2018-11-27 20:22:12 -05:00
Renato Westphal
13e8bc063f ldp-topo1: Remove check for protocol in installed LSPs 
PR #1213 in FRR changed the protocol of installed LSPs. To avoid breaking
older outstanding Pull Requests, remove the protocol check.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
 2018-11-27 20:22:12 -05:00
Martin Winter
ad59d1f5bb eigrp-topo1: Remove check for EIGRP distance 
- Distance used to be wrong (0), new commit fixes this (90). To avoid breaking older outstanding Pull Requests, remove the distance check

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2018-11-27 20:22:12 -05:00
Rafael Zalamena
7bd28cfc67 topotest: improve json error messages 
Show a diff of the JSON values instead of dumping the whole
data structures.
 2018-11-27 20:22:12 -05:00
Rafael Zalamena
2db5888df5 topotest: json_cmp_result split error lines 
When the API user wanted to show newlines we have to break them manually
to get the propper format.
 2018-11-27 20:22:12 -05:00
Rafael Zalamena
bc2872fd17 topotest: allow passing options to difflib 
Extend the topotest diff functions to allow receiving difflib options.
 2018-11-27 20:22:12 -05:00
Rafael Zalamena
566567e9be topotest: remove unused json_cmp unused parameter 2018-11-27 20:22:12 -05:00
Martin Winter
6ae351e837 all-protocol-startup/isis: Fix check for "show isis interface" to allow different circuit ids than 1 2018-11-27 20:22:12 -05:00
Rafael Zalamena
fcfbc7696b topogen: fix diagnostics failure 
Don't try to log to file if directory doesn't exist.
 2018-11-27 20:22:12 -05:00
Rafael Zalamena
d34f613477 topogen: save zebra version output 
Keep the zebra version output for later problem diagnostics.
 2018-11-27 20:22:12 -05:00
Rafael Zalamena
7547ebd8cd topogen: log diagnostics to file 2018-11-27 20:22:12 -05:00
Martin Winter
1b46274d5c eigrp-topo1: Cleanup leftover comments from previous commit 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2018-11-27 20:22:12 -05:00
Martin Winter
ee4523a215 eigrp-topo1: Change Route verification to use json 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2018-11-27 20:22:12 -05:00
Martin Winter
555451faa5 all-protocol-starup: Fix triple-output of same vtysh stderr/stdout messages. 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2018-11-27 20:22:12 -05:00
Martin Winter
7551168cba lib: Use SIGTERM for killing daemons first and only SIGBUS (7) if the daemons fail to exit. 
- This allows daemons to free up memory and avoid false memory leak reports

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2018-11-27 20:22:12 -05:00
Martin Winter
8e957dbb04 multiple_topos: Don't report about StdErr Output if there is no output 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2018-11-27 20:22:12 -05:00
Donald Sharp
9057cd2cc3 eigrp-topo1: Correct eigrp test results. 
The values saved for the route table and eigrp topo
were a bit off because they have been corrected
in the eigrp daemon

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2018-11-27 20:22:12 -05:00
Martin Winter
8ee1273e44 Enable eigrp-topo1 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2018-11-27 20:22:12 -05:00
Martin Winter
44a592b2a6 lib: check for eigrpd available and return warning if missing instead of failing 2018-11-27 20:22:12 -05:00
Rafael Zalamena
e5355a016f eigrp-topo1: convert to topogen 2018-11-27 20:22:12 -05:00
Rafael Zalamena
c267e5b112 topogen: add support for eigrpd and nhrp 2018-11-27 20:22:12 -05:00
Rafael Zalamena
57c5075b7b topogen: router startup failure triggers errors 
Makes `router_have_failure()` detect frr startup errors.
 2018-11-27 20:22:12 -05:00
Rafael Zalamena
b3b1b1d16c topogen: treat some corner cases on vtysh failure 
Don't throw unneeded tracebacks when 'show version' doesn't show us what
we expect, instead gracefully fail.
 2018-11-27 20:22:12 -05:00
Rafael Zalamena
1eb633c012 topogen: show pretty output for skipped messages 
Format them properly instead of printing a dictionary.
 2018-11-27 20:22:12 -05:00
Rafael Zalamena
333139b22e ldp_vpls_topo1: set an error instead of exit 
It will have the same effect and code will not have to be repeated since
all functions must call `routers_have_failure()`.
 2018-11-27 20:22:12 -05:00
Renato Westphal
f13a242c76 ldp_vpls_topo1: don't use pytest.mark.skipif 
This feature from pytest can not be used to detect runtime errors.

Also, remove test_router_running() since all tests should actually check
if all daemons are up and running.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
 2018-11-27 20:22:12 -05:00