doc: update for exabgp 4

Update the documentation to require exabgp 4 Signed-off-by: Louis Scalbert <[email protected]>
louis-6wind · Dec 14, 2023 · 3dc8b2c · 3dc8b2c
1 parent aee4afc
commit 3dc8b2c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 33 deletions.
diff --git a/doc/developer/building-frr-for-ubuntu2004.rst b/doc/developer/building-frr-for-ubuntu2004.rst
@@ -15,26 +15,14 @@ Installing Dependencies
       pkg-config libpam0g-dev libjson-c-dev bison flex \
       libc-ares-dev python3-dev python3-sphinx \
       install-info build-essential libsnmp-dev perl \
-      libcap-dev python2 libelf-dev libunwind-dev
+      libcap-dev libelf-dev libunwind-dev
 
 .. include:: building-libunwind-note.rst
 
 Note that Ubuntu 20 no longer installs python 2.x, so it must be
 installed explicitly. Ensure that your system has a symlink named
 ``/usr/bin/python`` pointing at ``/usr/bin/python3``.
 
-In addition, ``pip`` for python2 must be installed if you wish to run
-the FRR topotests. That version of ``pip`` is not available from the
-ubuntu apt repositories; in order to install it:
-
-.. code-block:: shell
-
-   curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py
-   sudo python2 ./get-pip.py
-
-   # And verify the installation
-   pip2 --version
-
 .. include:: building-libyang.rst
 
 Protobuf

diff --git a/doc/developer/building-frr-for-ubuntu2204.rst b/doc/developer/building-frr-for-ubuntu2204.rst
@@ -15,7 +15,7 @@ Installing Dependencies
       pkg-config libpam0g-dev libjson-c-dev bison flex \
       libc-ares-dev python3-dev python3-sphinx \
       install-info build-essential libsnmp-dev perl \
-      libcap-dev python2 libelf-dev libunwind-dev \
+      libcap-dev libelf-dev libunwind-dev \
       libyang2 libyang2-dev
 
 .. include:: building-libunwind-note.rst
@@ -29,18 +29,6 @@ installed explicitly. Ensure that your system has a symlink named
    sudo ln -s /usr/bin/python3 /usr/bin/python
    python --version
 
-In addition, ``pip`` for python2 must be installed if you wish to run
-the FRR topotests. That version of ``pip`` is not available from the
-ubuntu apt repositories; in order to install it:
-
-.. code-block:: shell
-
-   curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py
-   sudo python2 ./get-pip.py
-
-   # And verify the installation
-   pip2 --version
-
 
 Protobuf
 ^^^^^^^^

diff --git a/doc/developer/topotests.rst b/doc/developer/topotests.rst
@@ -8,14 +8,12 @@ Topotests is a suite of topology tests for FRR built on top of micronet.
 Installation and Setup
 ----------------------
 
-Topotests run under python3. Additionally, for ExaBGP (which is used
-in some of the BGP tests) an older python2 version (and the python2
-version of ``pip``) must be installed.
+Topotests run under python3.
 
 Tested with Ubuntu 20.04,Ubuntu 18.04, and Debian 11.
 
-Instructions are the same for all setups (i.e. ExaBGP is only used for
-BGP tests).
+Instructions are the same for all setups. However, ExaBGP is only used for
+BGP tests.
 
 Tshark is only required if you enable any packet captures on test runs.
 
@@ -39,8 +37,7 @@ Installing Topotest Requirements
    python3 -m pip install 'pytest-xdist>=2.3.0'
    python3 -m pip install 'scapy>=2.4.5'
    python3 -m pip install xmltodict
-   # Use python2 pip to install older ExaBGP
-   python2 -m pip install 'exabgp<4.0.0'
+   python3 -m pip install git+https://github.com/Exa-Networks/exabgp@0659057837cd6c6351579e9f0fa47e9fb7de7311
    useradd -d /var/run/exabgp/ -s /bin/false exabgp
 
    # To enable the gRPC topotest install: