Merging upstream version 10.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

42 files changed, 322 insertions, 381 deletions

diff --git a/tests/topotests/bgp_ecmp_topo1/exabgp.env b/tests/topotests/bgp_ecmp_topo1/exabgp.env
index a328e04..ec978c6 100644
--- a/tests/topotests/bgp_ecmp_topo1/exabgp.env
+++ b/tests/topotests/bgp_ecmp_topo1/exabgp.env
@@ -1,5 +1,6 @@
 
 [exabgp.api]
+ack = false
 encoder = text
 highres = false
 respawn = false
diff --git a/tests/topotests/bgp_ecmp_topo1/peer1/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer1/exa-send.py
index 6bef355..1a8e6bf 100755
--- a/tests/topotests/bgp_ecmp_topo1/peer1/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer1/exa-send.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
 exa-send.py: Send a few testroutes with ExaBGP
diff --git a/tests/topotests/bgp_ecmp_topo1/peer1/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer1/exabgp.cfg
index 2d0ca89..97a024c 100644
--- a/tests/topotests/bgp_ecmp_topo1/peer1/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer1/exabgp.cfg
@@ -1,21 +1,18 @@
-group controller {
-
-    process announce-routes {
-        run "/etc/exabgp/exa-send.py 1 10";
-    }
-
-    process receive-routes {
-        run "/etc/exabgp/exa-receive.py 1";
-        receive-routes;
-        encoder text;
-    }
+process announce-routes {
+    run /etc/exabgp/exa-send.py 1 10;
+    encoder text;
+}
 
-    neighbor 10.0.1.1 {
-        router-id 10.0.1.101;
-        local-address 10.0.1.101;
-        local-as 99;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 1;
+    encoder text;
+}
 
+neighbor 10.0.1.1 {
+    router-id 10.0.1.101;
+    local-address 10.0.1.101;
+    local-as 99;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_ecmp_topo1/peer10/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer10/exa-send.py
index 6bef355..1a8e6bf 100755
--- a/tests/topotests/bgp_ecmp_topo1/peer10/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer10/exa-send.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
 exa-send.py: Send a few testroutes with ExaBGP
diff --git a/tests/topotests/bgp_ecmp_topo1/peer10/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer10/exabgp.cfg
index 0c842a0..e318162 100644
--- a/tests/topotests/bgp_ecmp_topo1/peer10/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer10/exabgp.cfg
@@ -1,21 +1,18 @@
-group controller {
-
-    process announce-routes {
-        run "/etc/exabgp/exa-send.py 10 10";
-    }
-
-    process receive-routes {
-        run "/etc/exabgp/exa-receive.py 10";
-        receive-routes;
-        encoder text;
-    }
+process announce-routes {
+    run /etc/exabgp/exa-send.py 10 10;
+    encoder text;
+}
 
-    neighbor 10.0.2.1 {
-        router-id 10.0.2.110;
-        local-address 10.0.2.110;
-        local-as 99;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 10;
+    encoder text;
+}
 
+neighbor 10.0.2.1 {
+    router-id 10.0.2.110;
+    local-address 10.0.2.110;
+    local-as 99;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_ecmp_topo1/peer11/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer11/exa-send.py
index 6bef355..1a8e6bf 100755
--- a/tests/topotests/bgp_ecmp_topo1/peer11/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer11/exa-send.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
 exa-send.py: Send a few testroutes with ExaBGP
diff --git a/tests/topotests/bgp_ecmp_topo1/peer11/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer11/exabgp.cfg
index 936dc57..ea5bdcc 100644
--- a/tests/topotests/bgp_ecmp_topo1/peer11/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer11/exabgp.cfg
@@ -1,21 +1,18 @@
-group controller {
-
-    process announce-routes {
-        run "/etc/exabgp/exa-send.py 11 10";
-    }
-
-    process receive-routes {
-        run "/etc/exabgp/exa-receive.py 11";
-        receive-routes;
-        encoder text;
-    }
+process announce-routes {
+    run /etc/exabgp/exa-send.py 11 10;
+    encoder text;
+}
 
-    neighbor 10.0.3.1 {
-        router-id 10.0.3.111;
-        local-address 10.0.3.111;
-        local-as 111;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 11;
+    encoder text;
+}
 
+neighbor 10.0.3.1 {
+    router-id 10.0.3.111;
+    local-address 10.0.3.111;
+    local-as 111;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_ecmp_topo1/peer12/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer12/exa-send.py
index 6bef355..1a8e6bf 100755
--- a/tests/topotests/bgp_ecmp_topo1/peer12/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer12/exa-send.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
 exa-send.py: Send a few testroutes with ExaBGP
diff --git a/tests/topotests/bgp_ecmp_topo1/peer12/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer12/exabgp.cfg
index 56b33ea..81fb503 100644
--- a/tests/topotests/bgp_ecmp_topo1/peer12/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer12/exabgp.cfg
@@ -1,21 +1,18 @@
-group controller {
-
-    process announce-routes {
-        run "/etc/exabgp/exa-send.py 12 10";
-    }
-
-    process receive-routes {
-        run "/etc/exabgp/exa-receive.py 12";
-        receive-routes;
-        encoder text;
-    }
+process announce-routes {
+    run /etc/exabgp/exa-send.py 12 10;
+    encoder text;
+}
 
-    neighbor 10.0.3.1 {
-        router-id 10.0.3.112;
-        local-address 10.0.3.112;
-        local-as 112;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 12;
+    encoder text;
+}
 
+neighbor 10.0.3.1 {
+    router-id 10.0.3.112;
+    local-address 10.0.3.112;
+    local-as 112;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_ecmp_topo1/peer13/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer13/exa-send.py
index 6bef355..1a8e6bf 100755
--- a/tests/topotests/bgp_ecmp_topo1/peer13/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer13/exa-send.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
 exa-send.py: Send a few testroutes with ExaBGP
diff --git a/tests/topotests/bgp_ecmp_topo1/peer13/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer13/exabgp.cfg
index b933ffb..4007841 100644
--- a/tests/topotests/bgp_ecmp_topo1/peer13/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer13/exabgp.cfg
@@ -1,21 +1,18 @@
-group controller {
-
-    process announce-routes {
-        run "/etc/exabgp/exa-send.py 13 10";
-    }
-
-    process receive-routes {
-        run "/etc/exabgp/exa-receive.py 13";
-        receive-routes;
-        encoder text;
-    }
+process announce-routes {
+    run /etc/exabgp/exa-send.py 13 10;
+    encoder text;
+}
 
-    neighbor 10.0.3.1 {
-        router-id 10.0.3.113;
-        local-address 10.0.3.113;
-        local-as 113;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 13;
+    encoder text;
+}
 
+neighbor 10.0.3.1 {
+    router-id 10.0.3.113;
+    local-address 10.0.3.113;
+    local-as 113;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_ecmp_topo1/peer14/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer14/exa-send.py
index 6bef355..1a8e6bf 100755
--- a/tests/topotests/bgp_ecmp_topo1/peer14/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer14/exa-send.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
 exa-send.py: Send a few testroutes with ExaBGP
diff --git a/tests/topotests/bgp_ecmp_topo1/peer14/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer14/exabgp.cfg
index bcfa41e..afb8741 100644
--- a/tests/topotests/bgp_ecmp_topo1/peer14/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer14/exabgp.cfg
@@ -1,21 +1,18 @@
-group controller {
-
-    process announce-routes {
-        run "/etc/exabgp/exa-send.py 14 10";
-    }
-
-    process receive-routes {
-        run "/etc/exabgp/exa-receive.py 14";
-        receive-routes;
-        encoder text;
-    }
+process announce-routes {
+    run /etc/exabgp/exa-send.py 14 10;
+    encoder text;
+}
 
-    neighbor 10.0.3.1 {
-        router-id 10.0.3.114;
-        local-address 10.0.3.114;
-        local-as 114;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 14;
+    encoder text;
+}
 
+neighbor 10.0.3.1 {
+    router-id 10.0.3.114;
+    local-address 10.0.3.114;
+    local-as 114;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_ecmp_topo1/peer15/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer15/exa-send.py
index 6bef355..1a8e6bf 100755
--- a/tests/topotests/bgp_ecmp_topo1/peer15/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer15/exa-send.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
 exa-send.py: Send a few testroutes with ExaBGP
diff --git a/tests/topotests/bgp_ecmp_topo1/peer15/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer15/exabgp.cfg
index 022e835..9a4ca7f 100644
--- a/tests/topotests/bgp_ecmp_topo1/peer15/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer15/exabgp.cfg
@@ -1,21 +1,18 @@
-group controller {
-
-    process announce-routes {
-        run "/etc/exabgp/exa-send.py 15 10";
-    }
-
-    process receive-routes {
-        run "/etc/exabgp/exa-receive.py 15";
-        receive-routes;
-        encoder text;
-    }
+process announce-routes {
+    run /etc/exabgp/exa-send.py 15 10;
+    encoder text;
+}
 
-    neighbor 10.0.3.1 {
-        router-id 10.0.3.115;
-        local-address 10.0.3.115;
-        local-as 115;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 15;
+    encoder text;
+}
 
+neighbor 10.0.3.1 {
+    router-id 10.0.3.115;
+    local-address 10.0.3.115;
+    local-as 115;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_ecmp_topo1/peer16/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer16/exa-send.py
index 6bef355..1a8e6bf 100755
--- a/tests/topotests/bgp_ecmp_topo1/peer16/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer16/exa-send.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
 exa-send.py: Send a few testroutes with ExaBGP
diff --git a/tests/topotests/bgp_ecmp_topo1/peer16/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer16/exabgp.cfg
index 0649202..a0bb88a 100644
--- a/tests/topotests/bgp_ecmp_topo1/peer16/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer16/exabgp.cfg
@@ -1,21 +1,18 @@
-group controller {
-
-    process announce-routes {
-        run "/etc/exabgp/exa-send.py 16 10";
-    }
-
-    process receive-routes {
-        run "/etc/exabgp/exa-receive.py 16";
-        receive-routes;
-        encoder text;
-    }
+process announce-routes {
+    run /etc/exabgp/exa-send.py 16 10;
+    encoder text;
+}
 
-    neighbor 10.0.4.1 {
-        router-id 10.0.4.116;
-        local-address 10.0.4.116;
-        local-as 116;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 16;
+    encoder text;
+}
 
+neighbor 10.0.4.1 {
+    router-id 10.0.4.116;
+    local-address 10.0.4.116;
+    local-as 116;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_ecmp_topo1/peer17/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer17/exa-send.py
index 6bef355..1a8e6bf 100755
--- a/tests/topotests/bgp_ecmp_topo1/peer17/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer17/exa-send.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
 exa-send.py: Send a few testroutes with ExaBGP
diff --git a/tests/topotests/bgp_ecmp_topo1/peer17/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer17/exabgp.cfg
index 0aeeed9..870d33d 100644
--- a/tests/topotests/bgp_ecmp_topo1/peer17/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer17/exabgp.cfg
@@ -1,21 +1,18 @@
-group controller {
-
-    process announce-routes {
-        run "/etc/exabgp/exa-send.py 17 10";
-    }
-
-    process receive-routes {
-        run "/etc/exabgp/exa-receive.py 17";
-        receive-routes;
-        encoder text;
-    }
+process announce-routes {
+    run /etc/exabgp/exa-send.py 17 10;
+    encoder text;
+}
 
-    neighbor 10.0.4.1 {
-        router-id 10.0.4.117;
-        local-address 10.0.4.117;
-        local-as 117;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 17;
+    encoder text;
+}
 
+neighbor 10.0.4.1 {
+    router-id 10.0.4.117;
+    local-address 10.0.4.117;
+    local-as 117;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_ecmp_topo1/peer18/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer18/exa-send.py
index 6bef355..1a8e6bf 100755
--- a/tests/topotests/bgp_ecmp_topo1/peer18/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer18/exa-send.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
 exa-send.py: Send a few testroutes with ExaBGP
diff --git a/tests/topotests/bgp_ecmp_topo1/peer18/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer18/exabgp.cfg
index 352c030..c5a1ca6 100644
--- a/tests/topotests/bgp_ecmp_topo1/peer18/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer18/exabgp.cfg
@@ -1,21 +1,18 @@
-group controller {
-
-    process announce-routes {
-        run "/etc/exabgp/exa-send.py 18 10";
-    }
-
-    process receive-routes {
-        run "/etc/exabgp/exa-receive.py 18";
-        receive-routes;
-        encoder text;
-    }
+process announce-routes {
+    run /etc/exabgp/exa-send.py 18 10;
+    encoder text;
+}
 
-    neighbor 10.0.4.1 {
-        router-id 10.0.4.118;
-        local-address 10.0.4.118;
-        local-as 118;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 18;
+    encoder text;
+}
 
+neighbor 10.0.4.1 {
+    router-id 10.0.4.118;
+    local-address 10.0.4.118;
+    local-as 118;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_ecmp_topo1/peer19/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer19/exa-send.py
index 6bef355..1a8e6bf 100755
--- a/tests/topotests/bgp_ecmp_topo1/peer19/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer19/exa-send.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
 exa-send.py: Send a few testroutes with ExaBGP
diff --git a/tests/topotests/bgp_ecmp_topo1/peer19/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer19/exabgp.cfg
index 9913c22..f662ccf 100644
--- a/tests/topotests/bgp_ecmp_topo1/peer19/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer19/exabgp.cfg
@@ -1,21 +1,18 @@
-group controller {
-
-    process announce-routes {
-        run "/etc/exabgp/exa-send.py 19 10";
-    }
-
-    process receive-routes {
-        run "/etc/exabgp/exa-receive.py 19";
-        receive-routes;
-        encoder text;
-    }
+process announce-routes {
+    run /etc/exabgp/exa-send.py 19 10;
+    encoder text;
+}
 
-    neighbor 10.0.4.1 {
-        router-id 10.0.4.119;
-        local-address 10.0.4.119;
-        local-as 119;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 19;
+    encoder text;
+}
 
+neighbor 10.0.4.1 {
+    router-id 10.0.4.119;
+    local-address 10.0.4.119;
+    local-as 119;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_ecmp_topo1/peer2/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer2/exa-send.py
index 6bef355..1a8e6bf 100755
--- a/tests/topotests/bgp_ecmp_topo1/peer2/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer2/exa-send.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
 exa-send.py: Send a few testroutes with ExaBGP
diff --git a/tests/topotests/bgp_ecmp_topo1/peer2/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer2/exabgp.cfg
index 46b436d..673d6ec 100644
--- a/tests/topotests/bgp_ecmp_topo1/peer2/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer2/exabgp.cfg
@@ -1,21 +1,18 @@
-group controller {
-
-    process announce-routes {
-        run "/etc/exabgp/exa-send.py 2 10";
-    }
-
-    process receive-routes {
-        run "/etc/exabgp/exa-receive.py 2";
-        receive-routes;
-        encoder text;
-    }
+process announce-routes {
+    run /etc/exabgp/exa-send.py 2 10;
+    encoder text;
+}
 
-    neighbor 10.0.1.1 {
-        router-id 10.0.1.102;
-        local-address 10.0.1.102;
-        local-as 99;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 2;
+    encoder text;
+}
 
+neighbor 10.0.1.1 {
+    router-id 10.0.1.102;
+    local-address 10.0.1.102;
+    local-as 99;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_ecmp_topo1/peer20/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer20/exa-send.py
index 6bef355..1a8e6bf 100755
--- a/tests/topotests/bgp_ecmp_topo1/peer20/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer20/exa-send.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
 exa-send.py: Send a few testroutes with ExaBGP
diff --git a/tests/topotests/bgp_ecmp_topo1/peer20/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer20/exabgp.cfg
index 17fb816..5ea2c91 100644
--- a/tests/topotests/bgp_ecmp_topo1/peer20/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer20/exabgp.cfg
@@ -1,21 +1,18 @@
-group controller {
-
-    process announce-routes {
-        run "/etc/exabgp/exa-send.py 20 10";
-    }
-
-    process receive-routes {
-        run "/etc/exabgp/exa-receive.py 20";
-        receive-routes;
-        encoder text;
-    }
+process announce-routes {
+    run /etc/exabgp/exa-send.py 20 10;
+    encoder text;
+}
 
-    neighbor 10.0.4.1 {
-        router-id 10.0.4.120;
-        local-address 10.0.4.120;
-        local-as 120;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 20;
+    encoder text;
+}
 
+neighbor 10.0.4.1 {
+    router-id 10.0.4.120;
+    local-address 10.0.4.120;
+    local-as 120;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_ecmp_topo1/peer3/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer3/exa-send.py
index 6bef355..1a8e6bf 100755
--- a/tests/topotests/bgp_ecmp_topo1/peer3/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer3/exa-send.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
 exa-send.py: Send a few testroutes with ExaBGP
diff --git a/tests/topotests/bgp_ecmp_topo1/peer3/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer3/exabgp.cfg
index acd5775..47a25ca 100644
--- a/tests/topotests/bgp_ecmp_topo1/peer3/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer3/exabgp.cfg
@@ -1,21 +1,18 @@
-group controller {
-
-    process announce-routes {
-        run "/etc/exabgp/exa-send.py 3 10";
-    }
-
-    process receive-routes {
-        run "/etc/exabgp/exa-receive.py 3";
-        receive-routes;
-        encoder text;
-    }
+process announce-routes {
+    run /etc/exabgp/exa-send.py 3 10;
+    encoder text;
+}
 
-    neighbor 10.0.1.1 {
-        router-id 10.0.1.103;
-        local-address 10.0.1.103;
-        local-as 99;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 3;
+    encoder text;
+}
 
+neighbor 10.0.1.1 {
+    router-id 10.0.1.103;
+    local-address 10.0.1.103;
+    local-as 99;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_ecmp_topo1/peer4/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer4/exa-send.py
index 6bef355..1a8e6bf 100755
--- a/tests/topotests/bgp_ecmp_topo1/peer4/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer4/exa-send.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
 exa-send.py: Send a few testroutes with ExaBGP
diff --git a/tests/topotests/bgp_ecmp_topo1/peer4/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer4/exabgp.cfg
index 4c9a989..376ac5f 100644
--- a/tests/topotests/bgp_ecmp_topo1/peer4/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer4/exabgp.cfg
@@ -1,21 +1,18 @@
-group controller {
-
-    process announce-routes {
-        run "/etc/exabgp/exa-send.py 4 10";
-    }
-
-    process receive-routes {
-        run "/etc/exabgp/exa-receive.py 4";
-        receive-routes;
-        encoder text;
-    }
+process announce-routes {
+    run /etc/exabgp/exa-send.py 4 10;
+    encoder text;
+}
 
-    neighbor 10.0.1.1 {
-        router-id 10.0.1.104;
-        local-address 10.0.1.104;
-        local-as 99;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 4;
+    encoder text;
+}
 
+neighbor 10.0.1.1 {
+    router-id 10.0.1.104;
+    local-address 10.0.1.104;
+    local-as 99;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_ecmp_topo1/peer5/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer5/exa-send.py
index 6bef355..1a8e6bf 100755
--- a/tests/topotests/bgp_ecmp_topo1/peer5/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer5/exa-send.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
 exa-send.py: Send a few testroutes with ExaBGP
diff --git a/tests/topotests/bgp_ecmp_topo1/peer5/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer5/exabgp.cfg
index eba2aae..878d728 100644
--- a/tests/topotests/bgp_ecmp_topo1/peer5/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer5/exabgp.cfg
@@ -1,21 +1,18 @@
-group controller {
-
-    process announce-routes {
-        run "/etc/exabgp/exa-send.py 5 10";
-    }
-
-    process receive-routes {
-        run "/etc/exabgp/exa-receive.py 5";
-        receive-routes;
-        encoder text;
-    }
+process announce-routes {
+    run /etc/exabgp/exa-send.py 5 10;
+    encoder text;
+}
 
-    neighbor 10.0.1.1 {
-        router-id 10.0.1.105;
-        local-address 10.0.1.105;
-        local-as 99;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 5;
+    encoder text;
+}
 
+neighbor 10.0.1.1 {
+    router-id 10.0.1.105;
+    local-address 10.0.1.105;
+    local-as 99;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_ecmp_topo1/peer6/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer6/exa-send.py
index 6bef355..1a8e6bf 100755
--- a/tests/topotests/bgp_ecmp_topo1/peer6/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer6/exa-send.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
 exa-send.py: Send a few testroutes with ExaBGP
diff --git a/tests/topotests/bgp_ecmp_topo1/peer6/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer6/exabgp.cfg
index 38b6af0..fc70267 100644
--- a/tests/topotests/bgp_ecmp_topo1/peer6/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer6/exabgp.cfg
@@ -1,21 +1,18 @@
-group controller {
-
-    process announce-routes {
-        run "/etc/exabgp/exa-send.py 6 10";
-    }
-
-    process receive-routes {
-        run "/etc/exabgp/exa-receive.py 6";
-        receive-routes;
-        encoder text;
-    }
+process announce-routes {
+    run /etc/exabgp/exa-send.py 6 10;
+    encoder text;
+}
 
-    neighbor 10.0.2.1 {
-        router-id 10.0.2.106;
-        local-address 10.0.2.106;
-        local-as 99;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 6;
+    encoder text;
+}
 
+neighbor 10.0.2.1 {
+    router-id 10.0.2.106;
+    local-address 10.0.2.106;
+    local-as 99;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_ecmp_topo1/peer7/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer7/exa-send.py
index 6bef355..1a8e6bf 100755
--- a/tests/topotests/bgp_ecmp_topo1/peer7/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer7/exa-send.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
 exa-send.py: Send a few testroutes with ExaBGP
diff --git a/tests/topotests/bgp_ecmp_topo1/peer7/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer7/exabgp.cfg
index 7631e43..09827a8 100644
--- a/tests/topotests/bgp_ecmp_topo1/peer7/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer7/exabgp.cfg
@@ -1,21 +1,18 @@
-group controller {
-
-    process announce-routes {
-        run "/etc/exabgp/exa-send.py 7 10";
-    }
-
-    process receive-routes {
-        run "/etc/exabgp/exa-receive.py 7";
-        receive-routes;
-        encoder text;
-    }
+process announce-routes {
+    run /etc/exabgp/exa-send.py 7 10;
+    encoder text;
+}
 
-    neighbor 10.0.2.1 {
-        router-id 10.0.2.107;
-        local-address 10.0.2.107;
-        local-as 99;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 7;
+    encoder text;
+}
 
+neighbor 10.0.2.1 {
+    router-id 10.0.2.107;
+    local-address 10.0.2.107;
+    local-as 99;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_ecmp_topo1/peer8/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer8/exa-send.py
index 6bef355..1a8e6bf 100755
--- a/tests/topotests/bgp_ecmp_topo1/peer8/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer8/exa-send.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
 exa-send.py: Send a few testroutes with ExaBGP
diff --git a/tests/topotests/bgp_ecmp_topo1/peer8/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer8/exabgp.cfg
index 1cd1cd9..37c01da 100644
--- a/tests/topotests/bgp_ecmp_topo1/peer8/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer8/exabgp.cfg
@@ -1,21 +1,18 @@
-group controller {
-
-    process announce-routes {
-        run "/etc/exabgp/exa-send.py 8 10";
-    }
-
-    process receive-routes {
-        run "/etc/exabgp/exa-receive.py 8";
-        receive-routes;
-        encoder text;
-    }
+process announce-routes {
+    run /etc/exabgp/exa-send.py 8 10;
+    encoder text;
+}
 
-    neighbor 10.0.2.1 {
-        router-id 10.0.2.108;
-        local-address 10.0.2.108;
-        local-as 99;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 8;
+    encoder text;
+}
 
+neighbor 10.0.2.1 {
+    router-id 10.0.2.108;
+    local-address 10.0.2.108;
+    local-as 99;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_ecmp_topo1/peer9/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer9/exa-send.py
index 6bef355..1a8e6bf 100755
--- a/tests/topotests/bgp_ecmp_topo1/peer9/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer9/exa-send.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
 exa-send.py: Send a few testroutes with ExaBGP
diff --git a/tests/topotests/bgp_ecmp_topo1/peer9/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer9/exabgp.cfg
index 5771553..8fb5c58 100644
--- a/tests/topotests/bgp_ecmp_topo1/peer9/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer9/exabgp.cfg
@@ -1,21 +1,18 @@
-group controller {
-
-    process announce-routes {
-        run "/etc/exabgp/exa-send.py 9 10";
-    }
-
-    process receive-routes {
-        run "/etc/exabgp/exa-receive.py 9";
-        receive-routes;
-        encoder text;
-    }
+process announce-routes {
+    run /etc/exabgp/exa-send.py 9 10;
+    encoder text;
+}
 
-    neighbor 10.0.2.1 {
-        router-id 10.0.2.109;
-        local-address 10.0.2.109;
-        local-as 99;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 9;
+    encoder text;
+}
 
+neighbor 10.0.2.1 {
+    router-id 10.0.2.109;
+    local-address 10.0.2.109;
+    local-as 99;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_ecmp_topo1/test_bgp_ecmp_topo1.py b/tests/topotests/bgp_ecmp_topo1/test_bgp_ecmp_topo1.py
index 97751ec..7af3f48 100644
--- a/tests/topotests/bgp_ecmp_topo1/test_bgp_ecmp_topo1.py
+++ b/tests/topotests/bgp_ecmp_topo1/test_bgp_ecmp_topo1.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # SPDX-License-Identifier: ISC
 
 #