proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 22:29:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: Add JSON output for show rpki cache-connection

Browse Source 
```
spine1-debian-11# sh rpki cache-connection
Connected to group 1
rpki tcp cache 192.168.10.17 8283 pref 1 (connected)
rpki tcp cache 192.168.10.17 8282 pref 2
spine1-debian-11# sh rpki cache-connection json
{
  "connectedGroup":1,
  "connections":[
    {
      "mode":"tcp",
      "host":"192.168.10.17",
      "port":"8283",
      "preference":1,
      "state":"connected"
    },
    {
      "mode":"tcp",
      "host":"192.168.10.17",
      "port":"8282",
      "preference":2,
      "state":"disconnected"
    }
  ]
}
```

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
This commit is contained in:
Donatas Abraitis 2022-05-23 19:40:45 +03:00
parent ac425bfc2b
commit ae872c2f88
2 changed files with 96 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
bgpd/bgp_rpki.c
View File

@ -1312,28 +1312,51 @@ DEFUN (show_rpki_cache_server,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN (show_rpki_cache_connection, DEFPY (show_rpki_cache_connection,
show_rpki_cache_connection_cmd, show_rpki_cache_connection_cmd,
"show rpki cache-connection", "show rpki cache-connection [json$uj]",
SHOW_STR SHOW_STR
RPKI_OUTPUT_STRING RPKI_OUTPUT_STRING
"Show to which RPKI Cache Servers we have a connection\n") "Show to which RPKI Cache Servers we have a connection\n"
JSON_STR)
{ {
if (!is_synchronized()) { struct json_object *json = NULL;
vty_out(vty, "No connection to RPKI cache server.\n"); struct json_object *json_conn = NULL;
struct json_object *json_conns = NULL;
return CMD_SUCCESS;
}
struct listnode *cache_node; struct listnode *cache_node;
struct cache *cache; struct cache *cache;
struct rtr_mgr_group *group = get_connected_group(); struct rtr_mgr_group *group;
if (uj)
json = json_object_new_object();
if (!is_synchronized()) {
if (!json)
vty_out(vty, "No connection to RPKI cache server.\n");
else
vty_json(vty, json);
if (!group) {
vty_out(vty, "Cannot find a connected group.\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
group = get_connected_group();
if (!group) {
if (!json)
vty_out(vty, "Cannot find a connected group.\n");
else
vty_json(vty, json);
return CMD_SUCCESS;
}
if (!json) {
vty_out(vty, "Connected to group %d\n", group->preference); vty_out(vty, "Connected to group %d\n", group->preference);
} else {
json_conns = json_object_new_array();
json_object_int_add(json, "connectedGroup", group->preference);
json_object_object_add(json, "connections", json_conns);
}
for (ALL_LIST_ELEMENTS_RO(cache_list, cache_node, cache)) { for (ALL_LIST_ELEMENTS_RO(cache_list, cache_node, cache)) {
struct tr_tcp_config *tcp_config; struct tr_tcp_config *tcp_config;
#if defined(FOUND_SSH) #if defined(FOUND_SSH)
@ -1342,22 +1365,66 @@ DEFUN (show_rpki_cache_connection,
switch (cache->type) { switch (cache->type) {
case TCP: case TCP:
tcp_config = cache->tr_config.tcp_config; tcp_config = cache->tr_config.tcp_config;
vty_out(vty, "rpki tcp cache %s %s pref %hhu%s\n",
if (!json) {
vty_out(vty,
"rpki tcp cache %s %s pref %hhu%s\n",
tcp_config->host, tcp_config->port, tcp_config->host, tcp_config->port,
cache->preference, cache->preference,
cache->rtr_socket->state == RTR_ESTABLISHED cache->rtr_socket->state ==
RTR_ESTABLISHED
? " (connected)" ? " (connected)"
: ""); : "");
} else {
json_conn = json_object_new_object();
json_object_string_add(json_conn, "mode",
"tcp");
json_object_string_add(json_conn, "host",
tcp_config->host);
json_object_string_add(json_conn, "port",
tcp_config->port);
json_object_int_add(json_conn, "preference",
cache->preference);
json_object_string_add(
json_conn, "state",
cache->rtr_socket->state ==
RTR_ESTABLISHED
? "connected"
: "disconnected");
json_object_array_add(json_conns, json_conn);
}
break; break;
#if defined(FOUND_SSH) #if defined(FOUND_SSH)
case SSH: case SSH:
ssh_config = cache->tr_config.ssh_config; ssh_config = cache->tr_config.ssh_config;
vty_out(vty, "rpki ssh cache %s %u pref %hhu%s\n",
if (!json) {
vty_out(vty,
"rpki ssh cache %s %u pref %hhu%s\n",
ssh_config->host, ssh_config->port, ssh_config->host, ssh_config->port,
cache->preference, cache->preference,
cache->rtr_socket->state == RTR_ESTABLISHED cache->rtr_socket->state ==
RTR_ESTABLISHED
? " (connected)" ? " (connected)"
: ""); : "");
} else {
json_conn = json_object_new_object();
json_object_string_add(json_conn, "mode",
"ssh");
json_object_string_add(json_conn, "host",
ssh_config->host);
json_object_string_add(json_conn, "port",
ssh_config->port);
json_object_int_add(json_conn, "preference",
cache->preference);
json_object_string_add(
json_conn, "state",
cache->rtr_socket->state ==
RTR_ESTABLISHED
? "connected"
: "disconnected");
json_object_array_add(json_conns, json_conn);
}
break; break;
#endif #endif
default: default:
@ -1365,6 +1432,9 @@ DEFUN (show_rpki_cache_connection,
} }
} }
if (json)
vty_json(vty, json);
return CMD_SUCCESS; return CMD_SUCCESS;
} }

2
doc/user/rpki.rst
View File

@ -216,7 +216,7 @@ Displaying RPKI
received from the cache servers and stored in the router. Based on this data, received from the cache servers and stored in the router. Based on this data,
the router validates BGP Updates. the router validates BGP Updates.
.. clicmd:: show rpki cache-connection .. clicmd:: show rpki cache-connection [json]
Display all configured cache servers, whether active or not. Display all configured cache servers, whether active or not.