topotests: convert bgp_vrf_netns to exabgp 4

Convert bgp_vrf_netns to exabgp 4

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>

2 files changed, 16 insertions, 18 deletions

diff --git a/tests/topotests/bgp_vrf_netns/exabgp.env b/tests/topotests/bgp_vrf_netns/exabgp.env
index a328e04962..ec978c66e7 100644
--- a/tests/topotests/bgp_vrf_netns/exabgp.env
+++ b/tests/topotests/bgp_vrf_netns/exabgp.env
@@ -1,5 +1,6 @@
 
 [exabgp.api]
+ack = false
 encoder = text
 highres = false
 respawn = false
diff --git a/tests/topotests/bgp_vrf_netns/peer1/exabgp.cfg b/tests/topotests/bgp_vrf_netns/peer1/exabgp.cfg
index 2d0ca89f0f..97a024ce96 100644
--- a/tests/topotests/bgp_vrf_netns/peer1/exabgp.cfg
+++ b/tests/topotests/bgp_vrf_netns/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 ];}
 }