bgp-ecmp-topo1: change default vrf name

By default, default vrf name is default, whereas BGP default vrf was
hardcoded to Default. Because this will be fixes, do not care about the
vrf name field and apply a regexp to move Default to default.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>

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 d5c51ce276c63cb7fbb96b7ad44e069f92f60a85..c583371dd0a450a2626b78dd290276fb149c1513 100755 (executable)
--- a/tests/topotests/bgp-ecmp-topo1/test_bgp_ecmp_topo1.py
+++ b/tests/topotests/bgp-ecmp-topo1/test_bgp_ecmp_topo1.py
@@ -133,8 +133,20 @@ def test_bgp_convergence():
 
     expected = json.loads(open(reffile).read())
 
+    def _output_summary_cmp(router, cmd, data):
+        """
+        Runs `cmd` that returns JSON data (normally the command ends with 'json')
+        and compare with `data` contents.
+        """
+        output = router.vtysh_cmd(cmd, isjson=True)
+        if output.has_key('ipv4Unicast'):
+            output['ipv4Unicast']['vrfName'].replace('default', 'Default')
+        elif output.has_key('vrfName'):
+            output['vrfName'].replace('default', 'Default')
+        return topotest.json_cmp(output, data)
+
     test_func = functools.partial(
-        topotest.router_json_cmp, router, 'show ip bgp summary json', expected)
+        _output_summary_cmp, router, 'show ip bgp summary json', expected)
     _, res = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
     assertmsg = 'BGP router network did not converge'
     assert res is None, assertmsg