bgpd: Use gracefulRestart JSON field

Deprecate gracefulRestartCapability which is inconsistent with an existing
format if advertised and received are printed.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit ee5893ff598a72e3a9bf4d2f6a9bd43f833defa6)

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index f1363ee60dfd9b49d885f4c865cda1e576f5d249..c153d38386c942caafa14ce798a58e115189c6b7 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -14905,22 +14905,31 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, bool use_json,
                        if (CHECK_FLAG(p->cap, PEER_CAP_RESTART_RCV) ||
                            CHECK_FLAG(p->cap, PEER_CAP_RESTART_ADV)) {
                                if (CHECK_FLAG(p->cap, PEER_CAP_RESTART_ADV) &&
-                                   CHECK_FLAG(p->cap, PEER_CAP_RESTART_RCV))
+                                   CHECK_FLAG(p->cap, PEER_CAP_RESTART_RCV)) {
                                        json_object_string_add(
                                                json_cap, "gracefulRestart",
                                                "advertisedAndReceived");
-                               else if (CHECK_FLAG(p->cap,
-                                                   PEER_CAP_RESTART_ADV))
+                               } else if (CHECK_FLAG(p->cap, PEER_CAP_RESTART_ADV)) {
+                                       json_object_string_add(json_cap, "gracefulRestart",
+                                                              "advertised");
+#if CONFDATE > 20250525
+CPP_NOTICE("Remove `gracefulRestartCapability` JSON field")
+#endif
                                        json_object_string_add(
                                                json_cap,
                                                "gracefulRestartCapability",
                                                "advertised");
-                               else if (CHECK_FLAG(p->cap,
-                                                   PEER_CAP_RESTART_RCV))
+                               } else if (CHECK_FLAG(p->cap, PEER_CAP_RESTART_RCV)) {
+                                       json_object_string_add(json_cap, "gracefulRestart",
+                                                              "received");
+#if CONFDATE > 20250525
+CPP_NOTICE("Remove `gracefulRestartCapability` JSON field")
+#endif
                                        json_object_string_add(
                                                json_cap,
                                                "gracefulRestartCapability",
                                                "received");
+                               }
 
                                if (CHECK_FLAG(p->cap, PEER_CAP_RESTART_RCV)) {
                                        int restart_af_count = 0;