Merge pull request #17431 from krishna-samy/bgpd_json_commits

bgpd: show json output changes to optimize various show commands

1 files changed, 15 insertions, 0 deletions

diff --git a/tests/topotests/bgp_gr_notification/test_bgp_gr_notification.py b/tests/topotests/bgp_gr_notification/test_bgp_gr_notification.py
index 5d8338d6e..7e39b83d8 100644
--- a/tests/topotests/bgp_gr_notification/test_bgp_gr_notification.py
+++ b/tests/topotests/bgp_gr_notification/test_bgp_gr_notification.py
@@ -187,6 +187,16 @@ def test_bgp_administrative_reset_gr():
             """
         )
 
+    def _bgp_verify_show_bgp_router_json():
+        output = json.loads(r1.vtysh_cmd("show bgp router json"))
+        expected = {
+            "bgpStartedAt": "*",
+            "bgpStartedGracefully": False,
+            "bgpInMaintenanceMode": False,
+            "bgpInstanceCount": 1,
+        }
+        return topotest.json_cmp(output, expected)
+
     step("Initial BGP converge")
     test_func = functools.partial(_bgp_converge)
     _, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
@@ -205,6 +215,11 @@ def test_bgp_administrative_reset_gr():
     _, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
     assert result is None, "Failed to send Administrative Reset notification from R2"
 
+    step("Check show bgp router json")
+    test_func = functools.partial(_bgp_verify_show_bgp_router_json)
+    _, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
+    assert result is None, "Invalid BGP router details"
+
 
 if __name__ == "__main__":
     args = ["-s"] + sys.argv[1:]