topotests: convert bgp_multiview_topo1 to exabgp 4

Convert bgp_multiview_topo1 to exabgp 4

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

9 files changed, 121 insertions, 144 deletions

diff --git a/tests/topotests/bgp_multiview_topo1/exabgp.env b/tests/topotests/bgp_multiview_topo1/exabgp.env
index a328e04962..ec978c66e7 100644
--- a/tests/topotests/bgp_multiview_topo1/exabgp.env
+++ b/tests/topotests/bgp_multiview_topo1/exabgp.env
@@ -1,5 +1,6 @@
 
 [exabgp.api]
+ack = false
 encoder = text
 highres = false
 respawn = false
diff --git a/tests/topotests/bgp_multiview_topo1/peer1/exabgp.cfg b/tests/topotests/bgp_multiview_topo1/peer1/exabgp.cfg
index 20e71c8420..0303230b56 100644
--- a/tests/topotests/bgp_multiview_topo1/peer1/exabgp.cfg
+++ b/tests/topotests/bgp_multiview_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 172.16.1.254 {
-        router-id 172.16.1.1;
-        local-address 172.16.1.1;
-        local-as 65001;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 1;
+    encoder text;
+}
 
+neighbor 172.16.1.254 {
+    router-id 172.16.1.1;
+    local-address 172.16.1.1;
+    local-as 65001;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_multiview_topo1/peer2/exabgp.cfg b/tests/topotests/bgp_multiview_topo1/peer2/exabgp.cfg
index 1e8eef186f..13670c3b52 100644
--- a/tests/topotests/bgp_multiview_topo1/peer2/exabgp.cfg
+++ b/tests/topotests/bgp_multiview_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 172.16.1.254 {
-        router-id 172.16.1.2;
-        local-address 172.16.1.2;
-        local-as 65002;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 2;
+    encoder text;
+}
 
+neighbor 172.16.1.254 {
+    router-id 172.16.1.2;
+    local-address 172.16.1.2;
+    local-as 65002;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_multiview_topo1/peer3/exabgp.cfg b/tests/topotests/bgp_multiview_topo1/peer3/exabgp.cfg
index ef1b249aeb..0afc484c69 100644
--- a/tests/topotests/bgp_multiview_topo1/peer3/exabgp.cfg
+++ b/tests/topotests/bgp_multiview_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 172.16.1.254 {
-        router-id 172.16.1.3;
-        local-address 172.16.1.3;
-        local-as 65003;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 3;
+    encoder text;
+}
 
+neighbor 172.16.1.254 {
+    router-id 172.16.1.3;
+    local-address 172.16.1.3;
+    local-as 65003;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_multiview_topo1/peer4/exabgp.cfg b/tests/topotests/bgp_multiview_topo1/peer4/exabgp.cfg
index 7c50f73b26..0f5b536d9a 100644
--- a/tests/topotests/bgp_multiview_topo1/peer4/exabgp.cfg
+++ b/tests/topotests/bgp_multiview_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 172.16.1.254 {
-        router-id 172.16.1.4;
-        local-address 172.16.1.4;
-        local-as 65004;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 4;
+    encoder text;
+}
 
+neighbor 172.16.1.254 {
+    router-id 172.16.1.4;
+    local-address 172.16.1.4;
+    local-as 65004;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_multiview_topo1/peer5/exabgp.cfg b/tests/topotests/bgp_multiview_topo1/peer5/exabgp.cfg
index 22163c7fb1..365aa6b8f2 100644
--- a/tests/topotests/bgp_multiview_topo1/peer5/exabgp.cfg
+++ b/tests/topotests/bgp_multiview_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 172.16.1.254 {
-        router-id 172.16.1.5;
-        local-address 172.16.1.5;
-        local-as 65005;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 5;
+    encoder text;
+}
 
+neighbor 172.16.1.254 {
+    router-id 172.16.1.5;
+    local-address 172.16.1.5;
+    local-as 65005;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_multiview_topo1/peer6/exabgp.cfg b/tests/topotests/bgp_multiview_topo1/peer6/exabgp.cfg
index 40b54c33c5..10380334b8 100644
--- a/tests/topotests/bgp_multiview_topo1/peer6/exabgp.cfg
+++ b/tests/topotests/bgp_multiview_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 172.16.1.254 {
-        router-id 172.16.1.6;
-        local-address 172.16.1.6;
-        local-as 65006;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 6;
+    encoder text;
+}
 
+neighbor 172.16.1.254 {
+    router-id 172.16.1.6;
+    local-address 172.16.1.6;
+    local-as 65006;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_multiview_topo1/peer7/exabgp.cfg b/tests/topotests/bgp_multiview_topo1/peer7/exabgp.cfg
index 33312d052f..7411338abd 100644
--- a/tests/topotests/bgp_multiview_topo1/peer7/exabgp.cfg
+++ b/tests/topotests/bgp_multiview_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 172.16.1.254 {
-        router-id 172.16.1.7;
-        local-address 172.16.1.7;
-        local-as 65007;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 7;
+    encoder text;
+}
 
+neighbor 172.16.1.254 {
+    router-id 172.16.1.7;
+    local-address 172.16.1.7;
+    local-as 65007;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }
diff --git a/tests/topotests/bgp_multiview_topo1/peer8/exabgp.cfg b/tests/topotests/bgp_multiview_topo1/peer8/exabgp.cfg
index 173ccb980e..17a4e497e1 100644
--- a/tests/topotests/bgp_multiview_topo1/peer8/exabgp.cfg
+++ b/tests/topotests/bgp_multiview_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 172.16.1.254 {
-        router-id 172.16.1.8;
-        local-address 172.16.1.8;
-        local-as 65008;
-        peer-as 100;
-        graceful-restart;
-    }
+process receive-routes {
+    run /etc/exabgp/exa-receive.py 8;
+    encoder text;
+}
 
+neighbor 172.16.1.254 {
+    router-id 172.16.1.8;
+    local-address 172.16.1.8;
+    local-as 65008;
+    peer-as 100;
+    capability {graceful-restart;}
+    api {processes [ announce-routes, receive-routes ];}
 }