Merge pull request #4309 from nikos-github/frr-doc

doc: Provide info on what pkg to install if mpls-router module is missing

diff --git a/doc/developer/building-frr-for-ubuntu1804.rst b/doc/developer/building-frr-for-ubuntu1804.rst
index 1320bda5777bbcdc6857331e014e94269b111fe2..8bdc2b9c760622de5d176154c784c23c1ff5462e 100644 (file)
--- a/doc/developer/building-frr-for-ubuntu1804.rst
+++ b/doc/developer/building-frr-for-ubuntu1804.rst
@@ -104,6 +104,10 @@ And load the kernel modules on the running system:
 
    sudo modprobe mpls-router mpls-iptunnel
 
+If the above command returns an error, you may need to install the appropriate
+or latest linux-modules-extra-<kernel-version>-generic package. For example
+``apt-get install linux-modules-extra-`uname -r`-generic``
+
 Enable MPLS Forwarding
 """"""""""""""""""""""
 

diff --git a/doc/developer/topotests.rst b/doc/developer/topotests.rst
index 605b9c9a0cfeb588742850be73e8e94de4d13228..1e165a2444288637eb28e67687c40baf0d744150 100644 (file)
--- a/doc/developer/topotests.rst
+++ b/doc/developer/topotests.rst
@@ -105,6 +105,8 @@ Execute all tests with output to console
 
    py.test -s -v --tb=no
 
+The above command must be executed from inside the topotests directory.
+
 All test\_\* scripts in subdirectories are detected and executed (unless
 disabled in ``pytest.ini`` file).
 
@@ -119,6 +121,13 @@ Execute single test
    cd test_to_be_run
    ./test_to_be_run.py
 
+For example, and assuming you are inside the frr directory:
+
+.. code:: shell
+
+   cd tests/topotests/bgp_l3vpn_to_bgp_vrf
+   ./test_bgp_l3vpn_to_bgp_vrf.py
+
 For further options, refer to pytest documentation.
 
 Test will set exit code which can be used with ``git bisect``.