Merging upstream version 10.0.

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

2 files changed, 16 insertions, 19 deletions

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 ];}
 }