Adding upstream version 10.0.upstream/10.0

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

4 files changed, 18 insertions, 20 deletions

diff --git a/tests/topotests/bgp_vrf_netns/exabgp.env b/tests/topotests/bgp_vrf_netns/exabgp.env
index a328e04..ec978c6 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/exa-send.py b/tests/topotests/bgp_vrf_netns/peer1/exa-send.py
index ab0eb8c..c6a4499 100755
--- a/tests/topotests/bgp_vrf_netns/peer1/exa-send.py
+++ b/tests/topotests/bgp_vrf_netns/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_vrf_netns/peer1/exabgp.cfg b/tests/topotests/bgp_vrf_netns/peer1/exabgp.cfg
index 2d0ca89..97a024c 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 ];}
 }
diff --git a/tests/topotests/bgp_vrf_netns/test_bgp_vrf_netns_topo.py b/tests/topotests/bgp_vrf_netns/test_bgp_vrf_netns_topo.py
index 8457b75..028bc35 100644
--- a/tests/topotests/bgp_vrf_netns/test_bgp_vrf_netns_topo.py
+++ b/tests/topotests/bgp_vrf_netns/test_bgp_vrf_netns_topo.py
@@ -94,6 +94,7 @@ def setup_module(module):
     router.net.set_intf_netns("r1-eth0", ns, up=True)
 
     # run daemons
+    router.load_config(TopoRouter.RD_MGMTD, None, "--vrfwnetns")
     router.load_config(
         TopoRouter.RD_ZEBRA,
         os.path.join(CWD, "{}/zebra.conf".format("r1")),
@@ -205,7 +206,6 @@ def test_bgp_vrf_netns():
 
 
 if __name__ == "__main__":
-
     args = ["-s"] + sys.argv[1:]
     ret = pytest.main(args)