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

Merge pull request #8271 from idryzhov/fix-show-ip-ospf-database

Browse Source 
ospfd: fix "show ip ospf database" issues
This commit is contained in:
Russ White 2021-03-23 11:19:32 -04:00 committed by GitHub
commit 09e623fbe1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 86 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
doc/user/ospfd.rst
View File

@ -733,23 +733,25 @@ Showing Information
Json o/p of this command covers base route information Json o/p of this command covers base route information
i.e all LSAs except opaque lsa info. i.e all LSAs except opaque lsa info.
.. clicmd:: show ip ospf database [json] .. clicmd:: show ip ospf [vrf <NAME|all>] database [json]
.. clicmd:: show ip ospf database (asbr-summary|external|network|router|summary) [json] .. clicmd:: show ip ospf [vrf <NAME|all>] database (asbr-summary|external|network|router|summary) [json]
.. clicmd:: show ip ospf database (asbr-summary|external|network|router|summary) LINK-STATE-ID [json] .. clicmd:: show ip ospf [vrf <NAME|all>] database (asbr-summary|external|network|router|summary) LINK-STATE-ID [json]
.. clicmd:: show ip ospf database (asbr-summary|external|network|router|summary) LINK-STATE-ID adv-router ADV-ROUTER [json] .. clicmd:: show ip ospf [vrf <NAME|all>] database (asbr-summary|external|network|router|summary) LINK-STATE-ID adv-router ADV-ROUTER [json]
.. clicmd:: show ip ospf database (asbr-summary|external|network|router|summary) adv-router ADV-ROUTER [json] .. clicmd:: show ip ospf [vrf <NAME|all>] database (asbr-summary|external|network|router|summary) adv-router ADV-ROUTER [json]
.. clicmd:: show ip ospf database (asbr-summary|external|network|router|summary) LINK-STATE-ID self-originate [json] .. clicmd:: show ip ospf [vrf <NAME|all>] database (asbr-summary|external|network|router|summary) LINK-STATE-ID self-originate [json]
.. clicmd:: show ip ospf database (asbr-summary|external|network|router|summary) self-originate [json] .. clicmd:: show ip ospf [vrf <NAME|all>] database (asbr-summary|external|network|router|summary) self-originate [json]
.. clicmd:: show ip ospf database max-age [json] .. clicmd:: show ip ospf [vrf <NAME|all>] database max-age [json]
.. clicmd:: show ip ospf database self-originate [json] .. clicmd:: show ip ospf [vrf <NAME|all>] database self-originate [json]
Show the OSPF database summary.
.. clicmd:: show ip ospf route [json] .. clicmd:: show ip ospf route [json]
@ -780,17 +782,17 @@ Opaque LSA
extensions that are used with MPLS-TE; it does not support a extensions that are used with MPLS-TE; it does not support a
complete RSVP-TE solution. complete RSVP-TE solution.
.. clicmd:: show ip ospf database (opaque-link|opaque-area|opaque-external) .. clicmd:: show ip ospf [vrf <NAME|all>] database (opaque-link|opaque-area|opaque-external)
.. clicmd:: show ip ospf database (opaque-link|opaque-area|opaque-external) LINK-STATE-ID .. clicmd:: show ip ospf [vrf <NAME|all>] database (opaque-link|opaque-area|opaque-external) LINK-STATE-ID
.. clicmd:: show ip ospf database (opaque-link|opaque-area|opaque-external) LINK-STATE-ID adv-router ADV-ROUTER .. clicmd:: show ip ospf [vrf <NAME|all>] database (opaque-link|opaque-area|opaque-external) LINK-STATE-ID adv-router ADV-ROUTER
.. clicmd:: show ip ospf database (opaque-link|opaque-area|opaque-external) adv-router ADV-ROUTER .. clicmd:: show ip ospf [vrf <NAME|all>] database (opaque-link|opaque-area|opaque-external) adv-router ADV-ROUTER
.. clicmd:: show ip ospf database (opaque-link|opaque-area|opaque-external) LINK-STATE-ID self-originate .. clicmd:: show ip ospf [vrf <NAME|all>] database (opaque-link|opaque-area|opaque-external) LINK-STATE-ID self-originate
.. clicmd:: show ip ospf database (opaque-link|opaque-area|opaque-external) self-originate .. clicmd:: show ip ospf [vrf <NAME|all>] database (opaque-link|opaque-area|opaque-external) self-originate
Show Opaque LSA from the database. Show Opaque LSA from the database.

166
ospfd/ospf_vty.c
View File

@ -7109,14 +7109,14 @@ DEFUN (show_ip_ospf_database_max,
return ret; return ret;
} }
DEFUN (show_ip_ospf_instance_database, ALIAS (show_ip_ospf_database_max,
show_ip_ospf_instance_database_cmd, show_ip_ospf_database_cmd,
"show ip ospf [{(1-65535)|vrf NAME}] database [<asbr-summary|external|network|router|summary|nssa-external|opaque-link|opaque-area|opaque-as> [A.B.C.D [<self-originate|adv-router A.B.C.D>]]] [json]", "show ip ospf [vrf <NAME|all>] database [<asbr-summary|external|network|router|summary|nssa-external|opaque-link|opaque-area|opaque-as> [A.B.C.D [<self-originate|adv-router A.B.C.D>]]] [json]",
SHOW_STR SHOW_STR
IP_STR IP_STR
"OSPF information\n" "OSPF information\n"
"Instance ID\n"
VRF_CMD_HELP_STR VRF_CMD_HELP_STR
"All VRFs\n"
"Database summary\n" "Database summary\n"
OSPF_LSA_TYPES_DESC OSPF_LSA_TYPES_DESC
"Link State ID (as an IP address)\n" "Link State ID (as an IP address)\n"
@ -7124,78 +7124,6 @@ DEFUN (show_ip_ospf_instance_database,
"Advertising Router link states\n" "Advertising Router link states\n"
"Advertising Router (as an IP address)\n" "Advertising Router (as an IP address)\n"
JSON_STR) JSON_STR)
{
struct ospf *ospf;
unsigned short instance = 0;
struct listnode *node = NULL;
char *vrf_name = NULL;
bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx = 0;
uint8_t use_vrf = 0;
bool uj = use_json(argc, argv);
json_object *json = NULL;
if (uj)
json = json_object_new_object();
if (argv_find(argv, argc, "(1-65535)", &idx)) {
instance = strtoul(argv[idx]->arg, NULL, 10);
if (instance != ospf_instance)
return CMD_NOT_MY_INSTANCE;
ospf = ospf_lookup_instance(instance);
if (!ospf || !ospf->oi_running)
return CMD_SUCCESS;
return (show_ip_ospf_database_common(
vty, ospf, idx ? 1 : 0, argc, argv, use_vrf, json, uj));
} else if (argv_find(argv, argc, "vrf", &idx)) {
vrf_name = argv[++idx]->arg;
all_vrf = strmatch(vrf_name, "all");
}
if (vrf_name) {
use_vrf = 1;
if (all_vrf) {
for (ALL_LIST_ELEMENTS_RO(om->ospf, node, ospf)) {
if (!ospf->oi_running)
continue;
ret = (show_ip_ospf_database_common(
vty, ospf, idx ? 2 : 0, argc, argv,
use_vrf, json, uj));
}
} else {
ospf = ospf_lookup_by_inst_name(inst, vrf_name);
if ((ospf == NULL) || !ospf->oi_running) {
vty_out(vty, "%% OSPF instance not found\n");
return CMD_SUCCESS;
}
ret = (show_ip_ospf_database_common(
vty, ospf, idx ? 2 : 0, argc, argv, use_vrf,
json, uj));
}
} else {
/* Display default ospf (instance 0) info */
ospf = ospf_lookup_by_vrf_id(VRF_DEFAULT);
if (ospf == NULL || !ospf->oi_running) {
vty_out(vty, "%% OSPF instance not found\n");
return CMD_SUCCESS;
}
ret = (show_ip_ospf_database_common(vty, ospf, 0, argc, argv,
use_vrf, json, uj));
}
if (uj) {
vty_out(vty, "%s\n", json_object_to_json_string(json));
json_object_free(json);
}
return ret;
}
DEFUN (show_ip_ospf_instance_database_max, DEFUN (show_ip_ospf_instance_database_max,
show_ip_ospf_instance_database_max_cmd, show_ip_ospf_instance_database_max_cmd,
@ -7238,6 +7166,20 @@ DEFUN (show_ip_ospf_instance_database_max,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
ALIAS (show_ip_ospf_instance_database_max,
show_ip_ospf_instance_database_cmd,
"show ip ospf (1-65535) database [<asbr-summary|external|network|router|summary|nssa-external|opaque-link|opaque-area|opaque-as> [A.B.C.D [<self-originate|adv-router A.B.C.D>]]] [json]",
SHOW_STR
IP_STR
"OSPF information\n"
"Instance ID\n"
"Database summary\n"
OSPF_LSA_TYPES_DESC
"Link State ID (as an IP address)\n"
"Self-originated link states\n"
"Advertising Router link states\n"
"Advertising Router (as an IP address)\n"
JSON_STR)
static int show_ip_ospf_database_type_adv_router_common(struct vty *vty, static int show_ip_ospf_database_type_adv_router_common(struct vty *vty,
struct ospf *ospf, struct ospf *ospf,
@ -7327,14 +7269,14 @@ static int show_ip_ospf_database_type_adv_router_common(struct vty *vty,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN (show_ip_ospf_instance_database_type_adv_router, DEFUN (show_ip_ospf_database_type_adv_router,
show_ip_ospf_instance_database_type_adv_router_cmd, show_ip_ospf_database_type_adv_router_cmd,
"show ip ospf [{(1-65535)|vrf NAME}] database <asbr-summary|external|network|router|summary|nssa-external|opaque-link|opaque-area|opaque-as> <adv-router A.B.C.D|self-originate> [json]", "show ip ospf [vrf <NAME|all>] database <asbr-summary|external|network|router|summary|nssa-external|opaque-link|opaque-area|opaque-as> <adv-router A.B.C.D|self-originate> [json]",
SHOW_STR SHOW_STR
IP_STR IP_STR
"OSPF information\n" "OSPF information\n"
"Instance ID\n"
VRF_CMD_HELP_STR VRF_CMD_HELP_STR
"All VRFs\n"
"Database summary\n" "Database summary\n"
OSPF_LSA_TYPES_DESC OSPF_LSA_TYPES_DESC
"Advertising Router link states\n" "Advertising Router link states\n"
@ -7343,7 +7285,6 @@ DEFUN (show_ip_ospf_instance_database_type_adv_router,
JSON_STR) JSON_STR)
{ {
struct ospf *ospf = NULL; struct ospf *ospf = NULL;
unsigned short instance = 0;
struct listnode *node = NULL; struct listnode *node = NULL;
char *vrf_name = NULL; char *vrf_name = NULL;
bool all_vrf = false; bool all_vrf = false;
@ -7357,19 +7298,6 @@ DEFUN (show_ip_ospf_instance_database_type_adv_router,
if (uj) if (uj)
json = json_object_new_object(); json = json_object_new_object();
if (argv_find(argv, argc, "(1-65535)", &idx)) {
instance = strtoul(argv[idx]->arg, NULL, 10);
if (instance != ospf_instance)
return CMD_NOT_MY_INSTANCE;
ospf = ospf_lookup_instance(instance);
if (!ospf || !ospf->oi_running)
return CMD_SUCCESS;
return (show_ip_ospf_database_type_adv_router_common(
vty, ospf, idx ? 1 : 0, argc, argv, use_vrf, json, uj));
}
OSPF_FIND_VRF_ARGS(argv, argc, idx_vrf, vrf_name, all_vrf); OSPF_FIND_VRF_ARGS(argv, argc, idx_vrf, vrf_name, all_vrf);
if (vrf_name) { if (vrf_name) {
@ -7416,8 +7344,50 @@ DEFUN (show_ip_ospf_instance_database_type_adv_router,
} }
return ret; return ret;
/*return (show_ip_ospf_database_type_adv_router_common( }
vty, ospf, idx ? 1 : 0, argc, argv));*/
DEFUN (show_ip_ospf_instance_database_type_adv_router,
show_ip_ospf_instance_database_type_adv_router_cmd,
"show ip ospf (1-65535) database <asbr-summary|external|network|router|summary|nssa-external|opaque-link|opaque-area|opaque-as> <adv-router A.B.C.D|self-originate> [json]",
SHOW_STR
IP_STR
"OSPF information\n"
"Instance ID\n"
"Database summary\n"
OSPF_LSA_TYPES_DESC
"Advertising Router link states\n"
"Advertising Router (as an IP address)\n"
"Self-originated link states\n"
JSON_STR)
{
int idx_number = 3;
struct ospf *ospf;
unsigned short instance = 0;
bool uj = use_json(argc, argv);
json_object *json = NULL;
if (uj)
json = json_object_new_object();
instance = strtoul(argv[idx_number]->arg, NULL, 10);
if (instance != ospf_instance)
return CMD_NOT_MY_INSTANCE;
ospf = ospf_lookup_instance(instance);
if (!ospf || !ospf->oi_running)
return CMD_SUCCESS;
show_ip_ospf_database_type_adv_router_common(vty, ospf, 1, argc, argv,
0, json, uj);
if (uj) {
vty_out(vty, "%s\n",
json_object_to_json_string_ext(
json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
return CMD_SUCCESS;
} }
DEFUN (ip_ospf_authentication_args, DEFUN (ip_ospf_authentication_args,
@ -12375,8 +12345,10 @@ void ospf_vty_show_init(void)
install_element(VIEW_NODE, &show_ip_ospf_instance_cmd); install_element(VIEW_NODE, &show_ip_ospf_instance_cmd);
/* "show ip ospf database" commands. */ /* "show ip ospf database" commands. */
install_element(VIEW_NODE, &show_ip_ospf_database_cmd);
install_element(VIEW_NODE, &show_ip_ospf_database_max_cmd); install_element(VIEW_NODE, &show_ip_ospf_database_max_cmd);
install_element(VIEW_NODE,
&show_ip_ospf_database_type_adv_router_cmd);
install_element(VIEW_NODE, install_element(VIEW_NODE,
&show_ip_ospf_instance_database_type_adv_router_cmd); &show_ip_ospf_instance_database_type_adv_router_cmd);
install_element(VIEW_NODE, &show_ip_ospf_instance_database_cmd); install_element(VIEW_NODE, &show_ip_ospf_instance_database_cmd);