tests: stop using fifos in bgp...multipath_relax

.dir-locals.el

@@ -1,8 +1,11 @@
 ;;; Directory Local Variables
 ;;; For more information see (info "(emacs) Directory Variables")
-;;; Match project coding conventions
 
 ((c-mode . ((indent-tabs-mode . t)
             (show-trailing-whitespace . t)
-            (c-basic-offset . 8)
-            )))
+            (c-basic-offset . 8)))
+ (json-mode . ((js-indent-level 4)))
+ (python-mode . ((python-formatter . black)
+                 (eval (flycheck-select-checker 'python-pylint))
+                 (eval setf flycheck-pylintrc (flycheck-locate-config-file-ancestor-directories ".pylintrc" 'python-pylint))
+                 (python-fill-column . 88))))

.pylintrc

@@ -0,0 +1,6 @@
+[MASTER]
+init-hook="import sys; sys.path.insert(0, '..')"
+signature-mutators=common_config.retry,retry
+
+[MESSAGES CONTROL]
+disable=I,C,R,W

doc/developer/building-frr-for-ubuntu1804.rst

@@ -12,8 +12,8 @@ Installing Dependencies
    sudo apt update
    sudo apt-get install \
       git autoconf automake libtool make libreadline-dev texinfo \
-      pkg-config libpam0g-dev libjson-c-dev bison flex python3-pytest \
-      libc-ares-dev python3-dev python-ipaddress python3-sphinx \
+      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 \
       libelf-dev
 

doc/developer/building-frr-for-ubuntu2004.rst

@@ -12,8 +12,8 @@ Installing Dependencies
    sudo apt update
    sudo apt-get install \
       git autoconf automake libtool make libreadline-dev texinfo \
-      pkg-config libpam0g-dev libjson-c-dev bison flex python3-pytest \
-      libc-ares-dev python3-dev python-ipaddress python3-sphinx \
+      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
 

docker/ubuntu18-ci/Dockerfile

@@ -6,16 +6,18 @@ ENV APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn
 RUN apt update && \
     apt-get install -y \
       git autoconf automake libtool make libreadline-dev texinfo \
-      pkg-config libpam0g-dev libjson-c-dev bison flex python3-pytest \
-      libc-ares-dev python3-dev python-ipaddress python3-sphinx \
+      pkg-config libpam0g-dev libjson-c-dev bison flex python3-pip \
+      libc-ares-dev python3-dev python3-sphinx \
       install-info build-essential libsnmp-dev perl libcap-dev \
       libelf-dev \
       sudo gdb iputils-ping time \
-      mininet python-pip iproute2 iperf && \
-      pip install ipaddr && \
-      pip install "pytest<5" && \
-      pip install "scapy>=2.4.2" && \
-      pip install exabgp==3.4.17
+      python-pip net-tools iproute2 && \
+      python3 -m pip install wheel && \
+      python3 -m pip install pytest && \
+      python3 -m pip install pytest-xdist && \
+      python3 -m pip install "scapy>=2.4.2" && \
+      python3 -m pip install xmltodict && \
+      python2 -m pip install 'exabgp<4.0.0'
 
 RUN groupadd -r -g 92 frr && \
       groupadd -r -g 85 frrvty && \

docker/ubuntu20-ci/Dockerfile

@@ -6,21 +6,23 @@ ENV APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn
 RUN apt update && \
     apt-get install -y \
       git autoconf automake libtool make libreadline-dev texinfo \
-      pkg-config libpam0g-dev libjson-c-dev bison flex python3-pytest \
-      libc-ares-dev python3-dev python-ipaddress python3-sphinx \
+      pkg-config libpam0g-dev libjson-c-dev bison flex python3-pip \
+      libc-ares-dev python3-dev python3-sphinx \
       install-info build-essential libsnmp-dev perl \
       libcap-dev python2 libelf-dev \
       sudo gdb curl iputils-ping time \
       libgrpc++-dev libgrpc-dev protobuf-compiler-grpc \
       lua5.3 liblua5.3-dev \
-      mininet iproute2 iperf && \
+      net-tools iproute2 && \
       curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output /tmp/get-pip.py && \
       python2 /tmp/get-pip.py && \
       rm -f  /tmp/get-pip.py && \
-      pip2 install ipaddr && \
-      pip2 install "pytest<5" && \
-      pip2 install "scapy>=2.4.2" && \
-      pip2 install exabgp==3.4.17
+      python3 -m pip install wheel && \
+      python3 -m pip install pytest && \
+      python3 -m pip install pytest-xdist && \
+      python3 -m pip install "scapy>=2.4.2" && \
+      python3 -m pip install xmltodict && \
+      python2 -m pip install 'exabgp<4.0.0'
 
 RUN groupadd -r -g 92 frr && \
       groupadd -r -g 85 frrvty && \

ospfd/ospf_flood.c

@@ -265,6 +265,8 @@ static void ospf_process_self_originated_lsa(struct ospf *ospf,
 				ei_aggr.route_map_set.metric = -1;
 				ei_aggr.route_map_set.metric_type = -1;
 
+				SET_FLAG(aggr->flags,
+					 OSPF_EXTERNAL_AGGRT_ORIGINATED);
 				ospf_external_lsa_refresh(ospf, new, &ei_aggr,
 						  LSA_REFRESH_FORCE, true);
 				SET_FLAG(aggr->flags,

ospfd/ospf_lsa.c

@@ -3629,6 +3629,8 @@ struct ospf_lsa *ospf_lsa_refresh(struct ospf *ospf, struct ospf_lsa *lsa)
 				ei_aggr.route_map_set.metric = -1;
 				ei_aggr.route_map_set.metric_type = -1;
 
+				SET_FLAG(aggr->flags,
+					 OSPF_EXTERNAL_AGGRT_ORIGINATED);
 				ospf_external_lsa_refresh(ospf, lsa, &ei_aggr,
 						  LSA_REFRESH_FORCE, true);
 				SET_FLAG(aggr->flags,