zebra: Add `show fpm status [json]` command

Add a command to get the status of the dplane_fpm_nl
module.

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

diff --git a/zebra/dplane_fpm_nl.c b/zebra/dplane_fpm_nl.c
index 7ae1b2a0901a63efb89dcdb34cc96d38e8d60567..3e7e84edd2caa98ba925371bf79e5bb611b4eaa3 100644 (file)
--- a/zebra/dplane_fpm_nl.c
+++ b/zebra/dplane_fpm_nl.c
@@ -30,6 +30,7 @@
 #include "lib/network.h"
 #include "lib/ns.h"
 #include "lib/frr_pthread.h"
+#include "lib/termtable.h"
 #include "zebra/debug.h"
 #include "zebra/interface.h"
 #include "zebra/zebra_dplane.h"
@@ -44,6 +45,8 @@
 #include "zebra/debug.h"
 #include "fpm/fpm.h"
 
+#include "zebra/dplane_fpm_nl_clippy.c"
+
 #define SOUTHBOUND_DEFAULT_ADDR INADDR_LOOPBACK
 
 /*
@@ -322,6 +325,74 @@ DEFUN(fpm_reset_counters, fpm_reset_counters_cmd,
        return CMD_SUCCESS;
 }
 
+DEFPY(fpm_show_status,
+      fpm_show_status_cmd,
+      "show fpm status [json]$json",
+      SHOW_STR FPM_STR "FPM status\n" JSON_STR)
+{
+       struct json_object *j;
+       bool connected;
+       uint16_t port;
+       struct sockaddr_in *sin;
+       struct sockaddr_in6 *sin6;
+       char buf[BUFSIZ];
+
+       connected = gfnc->socket > 0 ? true : false;
+
+       switch (gfnc->addr.ss_family) {
+       case AF_INET:
+               sin = (struct sockaddr_in *)&gfnc->addr;
+               snprintfrr(buf, sizeof(buf), "%pI4", &sin->sin_addr);
+               port = ntohs(sin->sin_port);
+               break;
+       case AF_INET6:
+               sin6 = (struct sockaddr_in6 *)&gfnc->addr;
+               snprintfrr(buf, sizeof(buf), "%pI6", &sin6->sin6_addr);
+               port = ntohs(sin6->sin6_port);
+               break;
+       default:
+               strlcpy(buf, "Unknown", sizeof(buf));
+               port = FPM_DEFAULT_PORT;
+               break;
+       }
+
+       if (json) {
+               j = json_object_new_object();
+
+               json_object_boolean_add(j, "connected", connected);
+               json_object_boolean_add(j, "useNHG", gfnc->use_nhg);
+               json_object_boolean_add(j, "useRouteReplace",
+                                       gfnc->use_route_replace);
+               json_object_boolean_add(j, "disabled", gfnc->disabled);
+               json_object_string_add(j, "address", buf);
+               json_object_int_add(j, "port", port);
+
+               vty_json(vty, j);
+       } else {
+               struct ttable *table = ttable_new(&ttable_styles[TTSTYLE_BLANK]);
+               char *out;
+
+               ttable_rowseps(table, 0, BOTTOM, true, '-');
+               ttable_add_row(table, "Address to connect to|%s", buf);
+               ttable_add_row(table, "Port|%u", port);
+               ttable_add_row(table, "Connected|%s", connected ? "Yes" : "No");
+               ttable_add_row(table, "Use Nexthop Groups|%s",
+                              gfnc->use_nhg ? "Yes" : "No");
+               ttable_add_row(table, "Use Route Replace Semantics|%s",
+                              gfnc->use_route_replace ? "Yes" : "No");
+               ttable_add_row(table, "Disabled|%s",
+                              gfnc->disabled ? "Yes" : "No");
+
+               out = ttable_dump(table, "\n");
+               vty_out(vty, "%s\n", out);
+               XFREE(MTYPE_TMP, out);
+
+               ttable_del(table);
+       }
+
+       return CMD_SUCCESS;
+}
+
 DEFUN(fpm_show_counters, fpm_show_counters_cmd,
       "show fpm counters",
       SHOW_STR
@@ -1665,6 +1736,7 @@ static int fpm_nl_new(struct event_loop *tm)
                zlog_debug("%s register status: %d", prov_name, rv);
 
        install_node(&fpm_node);
+       install_element(ENABLE_NODE, &fpm_show_status_cmd);
        install_element(ENABLE_NODE, &fpm_show_counters_cmd);
        install_element(ENABLE_NODE, &fpm_show_counters_json_cmd);
        install_element(ENABLE_NODE, &fpm_reset_counters_cmd);

diff --git a/zebra/subdir.am b/zebra/subdir.am
index 41088e2c4c0556d432d491a02a8020a5501b1b3d..f7674473661c3f60b2efc163479d863ab4954929 100644 (file)
--- a/zebra/subdir.am
+++ b/zebra/subdir.am
@@ -122,6 +122,7 @@ zebra_zebra_SOURCES = \
 
 clippy_scan += \
        zebra/debug.c \
+       zebra/dplane_fpm_nl.c \
        zebra/interface.c \
        zebra/rtadv.c \
        zebra/zebra_mlag_vty.c \