tests: Add some more data gathering

From last addition we can tell that the nexthop-group C is
installed but pbr does not think it is.  This failure
has been consistent the last 4-5 runs in master.  Lets
add a bit more data gathering to figure out what is going on.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/tests/topotests/pbr-topo1/r1/pbrd.conf b/tests/topotests/pbr-topo1/r1/pbrd.conf
index 4a126151b09291898c9f5155f1bbf212c598876f..298cba2860c0ac74a2989e7959507cdadf654bd1 100644 (file)
--- a/tests/topotests/pbr-topo1/r1/pbrd.conf
+++ b/tests/topotests/pbr-topo1/r1/pbrd.conf
@@ -1,4 +1,7 @@
 debug pbr
+debug pbr events
+debug pbr nht
+debug pbr zebra
 # Valid table range
 pbr table range 10000 50000
 # Try to set invalid bounds

diff --git a/tests/topotests/pbr-topo1/test_pbr_topo1.py b/tests/topotests/pbr-topo1/test_pbr_topo1.py
index a0ee6377c52e89001fa9b5aa04280b7cf45e037b..5fa25813bb95a4581d5028025f0fff253b8f1db7 100755 (executable)
--- a/tests/topotests/pbr-topo1/test_pbr_topo1.py
+++ b/tests/topotests/pbr-topo1/test_pbr_topo1.py
@@ -244,18 +244,28 @@ if __name__ == "__main__":
 #
 def gather_pbr_data_on_error(router):
     logger.info(router.vtysh_cmd("show ip route"))
-    logger.info(router.vtysh_cmd("show ip nexthop"))
+    logger.info(router.vtysh_cmd("show ip route vrf vrf-chiyoda"))
+    logger.info(router.vtysh_cmd("show ip nht"))
     logger.info(router.vtysh_cmd("show pbr interface"))
     logger.info(router.vtysh_cmd("show pbr map"))
     logger.info(router.vtysh_cmd("show pbr nexthop-groups"))
-    logger.info(router.vtysh_cmd("show nexthop-group rib singleton"))
+    logger.info(router.vtysh_cmd("show nexthop-group rib singleton ip"))
+    logger.info(router.vtysh_cmd("show nexthop-group rib singleton ipv6"))
     logger.info(router.vtysh_cmd("show nexthop-group rib"))
     logger.info(router.run("ip nexthop show"))
     logger.info(router.run("ip route show"))
+    logger.info(router.run("ip route show table 1000"))
     logger.info(router.run("ip route show table 10000"))
+    logger.info(router.run("ip -6 route show table 10000"))
     logger.info(router.run("ip route show table 10001"))
+    logger.info(router.run("ip -6 route show table 10001"))
     logger.info(router.run("ip route show table 10002"))
+    logger.info(router.run("ip -6 route show table 10002"))
     logger.info(router.run("ip route show table 10003"))
+    logger.info(router.run("ip -6 route show table 10003"))
     logger.info(router.run("ip route show table 10004"))
+    logger.info(router.run("ip -6 route show table 10004"))
+    logger.info(router.run("ip route show table 10005"))
+    logger.info(router.run("ip -6 route show table 10005"))
     logger.info(router.run("ip rule show"))