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

Merge pull request #15922 from anlancs/isisd/fix-unnecessary-check-vrf-cleanup

Browse Source 
isisd: remove unnecessary checkings for vrf
This commit is contained in:
Russ White 2024-05-07 11:00:14 -04:00 committed by GitHub
commit 61c4d4f6c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 205 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
isisd/isis_spf.c
View File

@ -2469,7 +2469,6 @@ DEFUN(show_isis_topology, show_isis_topology_cmd,
} }
ISIS_FIND_VRF_ARGS(argv, argc, idx_vrf, vrf_name, all_vrf); ISIS_FIND_VRF_ARGS(argv, argc, idx_vrf, vrf_name, all_vrf);
if (vrf_name) {
if (all_vrf) { if (all_vrf) {
for (ALL_LIST_ELEMENTS_RO(im->isis, node, isis)) { for (ALL_LIST_ELEMENTS_RO(im->isis, node, isis)) {
if (all_algorithm) { if (all_algorithm) {
@ -2480,8 +2479,7 @@ DEFUN(show_isis_topology, show_isis_topology_cmd,
vty, levels, isis, vty, levels, isis,
(uint8_t)algorithm); (uint8_t)algorithm);
} else { } else {
show_isis_topology_common( show_isis_topology_common(vty, levels, isis,
vty, levels, isis,
(uint8_t)algorithm); (uint8_t)algorithm);
} }
} }
@ -2497,9 +2495,7 @@ DEFUN(show_isis_topology, show_isis_topology_cmd,
(uint8_t)algorithm); (uint8_t)algorithm);
} }
} else } else
show_isis_topology_common(vty, levels, isis, show_isis_topology_common(vty, levels, isis, (uint8_t)algorithm);
(uint8_t)algorithm);
}
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -2672,17 +2668,14 @@ DEFUN(show_isis_flex_algo, show_isis_flex_algo_cmd,
ISIS_FIND_VRF_ARGS(argv, argc, idx_vrf, vrf_name, all_vrf); ISIS_FIND_VRF_ARGS(argv, argc, idx_vrf, vrf_name, all_vrf);
if (vrf_name) {
if (all_vrf) { if (all_vrf) {
for (ALL_LIST_ELEMENTS_RO(im->isis, node, isis)) for (ALL_LIST_ELEMENTS_RO(im->isis, node, isis))
show_isis_flex_algo_common(vty, isis, show_isis_flex_algo_common(vty, isis, flex_algo);
flex_algo);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
isis = isis_lookup_by_vrfname(vrf_name); isis = isis_lookup_by_vrfname(vrf_name);
if (isis != NULL) if (isis != NULL)
show_isis_flex_algo_common(vty, isis, flex_algo); show_isis_flex_algo_common(vty, isis, flex_algo);
}
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -3140,34 +3133,8 @@ DEFUN(show_isis_route, show_isis_route_cmd,
if (uj) if (uj)
json = json_object_new_array(); json = json_object_new_array();
if (vrf_name) {
if (all_vrf) { if (all_vrf) {
for (ALL_LIST_ELEMENTS_RO(im->isis, node, isis)) { for (ALL_LIST_ELEMENTS_RO(im->isis, node, isis)) {
if (all_algorithm)
show_isis_route_all_algos(vty, levels,
isis,
prefix_sid,
backup,
uj ? &json_vrf
: NULL);
else
show_isis_route_common(vty, levels,
isis, prefix_sid,
backup, algorithm,
uj ? &json_vrf
: NULL);
if (uj) {
json_object_object_add(
json_vrf, "vrf_id",
json_object_new_int(
isis->vrf_id));
json_object_array_add(json, json_vrf);
}
}
goto out;
}
isis = isis_lookup_by_vrfname(vrf_name);
if (isis != NULL) {
if (all_algorithm) if (all_algorithm)
show_isis_route_all_algos(vty, levels, isis, show_isis_route_all_algos(vty, levels, isis,
prefix_sid, backup, prefix_sid, backup,
@ -3178,12 +3145,28 @@ DEFUN(show_isis_route, show_isis_route_cmd,
algorithm, algorithm,
uj ? &json_vrf : NULL); uj ? &json_vrf : NULL);
if (uj) { if (uj) {
json_object_object_add( json_object_object_add(json_vrf, "vrf_id",
json_vrf, "vrf_id", json_object_new_int(
json_object_new_int(isis->vrf_id)); isis->vrf_id));
json_object_array_add(json, json_vrf); json_object_array_add(json, json_vrf);
} }
} }
goto out;
}
isis = isis_lookup_by_vrfname(vrf_name);
if (isis != NULL) {
if (all_algorithm)
show_isis_route_all_algos(vty, levels, isis, prefix_sid,
backup, uj ? &json_vrf : NULL);
else
show_isis_route_common(vty, levels, isis, prefix_sid,
backup, algorithm,
uj ? &json_vrf : NULL);
if (uj) {
json_object_object_add(json_vrf, "vrf_id",
json_object_new_int(isis->vrf_id));
json_object_array_add(json, json_vrf);
}
} }
out: out:
@ -3395,7 +3378,6 @@ DEFUN(show_isis_frr_summary, show_isis_frr_summary_cmd,
} }
ISIS_FIND_VRF_ARGS(argv, argc, idx, vrf_name, all_vrf); ISIS_FIND_VRF_ARGS(argv, argc, idx, vrf_name, all_vrf);
if (vrf_name) {
if (all_vrf) { if (all_vrf) {
for (ALL_LIST_ELEMENTS_RO(im->isis, node, isis)) for (ALL_LIST_ELEMENTS_RO(im->isis, node, isis))
show_isis_frr_summary_common(vty, levels, isis); show_isis_frr_summary_common(vty, levels, isis);
@ -3404,7 +3386,6 @@ DEFUN(show_isis_frr_summary, show_isis_frr_summary_cmd,
isis = isis_lookup_by_vrfname(vrf_name); isis = isis_lookup_by_vrfname(vrf_name);
if (isis != NULL) if (isis != NULL)
show_isis_frr_summary_common(vty, levels, isis); show_isis_frr_summary_common(vty, levels, isis);
}
return CMD_SUCCESS; return CMD_SUCCESS;
} }

13
isisd/isis_te.c
View File

@ -1690,11 +1690,10 @@ DEFUN(show_isis_mpls_te_router,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
ISIS_FIND_VRF_ARGS(argv, argc, idx_vrf, vrf_name, all_vrf); ISIS_FIND_VRF_ARGS(argv, argc, idx_vrf, vrf_name, all_vrf);
if (vrf_name) {
if (all_vrf) { if (all_vrf) {
for (ALL_LIST_ELEMENTS_RO(im->isis, inode, isis)) { for (ALL_LIST_ELEMENTS_RO(im->isis, inode, isis)) {
for (ALL_LIST_ELEMENTS_RO(isis->area_list, for (ALL_LIST_ELEMENTS_RO(isis->area_list, anode, area)) {
anode, area)) {
if (!IS_MPLS_TE(area->mta)) if (!IS_MPLS_TE(area->mta))
continue; continue;
@ -1705,16 +1704,13 @@ DEFUN(show_isis_mpls_te_router,
} }
isis = isis_lookup_by_vrfname(vrf_name); isis = isis_lookup_by_vrfname(vrf_name);
if (isis != NULL) { if (isis != NULL) {
for (ALL_LIST_ELEMENTS_RO(isis->area_list, anode, for (ALL_LIST_ELEMENTS_RO(isis->area_list, anode, area)) {
area)) {
if (!IS_MPLS_TE(area->mta)) if (!IS_MPLS_TE(area->mta))
continue; continue;
show_router_id(vty, area); show_router_id(vty, area);
} }
} }
}
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -2162,7 +2158,7 @@ DEFUN(show_isis_mpls_te_db,
int rc = CMD_WARNING; int rc = CMD_WARNING;
ISIS_FIND_VRF_ARGS(argv, argc, idx_vrf, vrf_name, all_vrf); ISIS_FIND_VRF_ARGS(argv, argc, idx_vrf, vrf_name, all_vrf);
if (vrf_name) {
if (all_vrf) { if (all_vrf) {
for (ALL_LIST_ELEMENTS_RO(im->isis, node, isis)) { for (ALL_LIST_ELEMENTS_RO(im->isis, node, isis)) {
rc = show_isis_ted(vty, argv, argc, isis); rc = show_isis_ted(vty, argv, argc, isis);
@ -2174,7 +2170,6 @@ DEFUN(show_isis_mpls_te_db,
isis = isis_lookup_by_vrfname(vrf_name); isis = isis_lookup_by_vrfname(vrf_name);
if (isis) if (isis)
rc = show_isis_ted(vty, argv, argc, isis); rc = show_isis_ted(vty, argv, argc, isis);
}
return rc; return rc;
} }

193
isisd/isisd.c
View File

@ -988,63 +988,17 @@ int show_isis_interface_common_json(struct json_object *json,
"no"); "no");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
if (vrf_name) {
if (all_vrf) { if (all_vrf) {
for (ALL_LIST_ELEMENTS_RO(im->isis, inode, isis)) { for (ALL_LIST_ELEMENTS_RO(im->isis, inode, isis)) {
areas_json = json_object_new_array();
json_object_object_add(json, "areas",
areas_json);
for (ALL_LIST_ELEMENTS_RO(isis->area_list,
anode, area)) {
area_json = json_object_new_object();
json_object_string_add(
area_json, "area",
area->area_tag ? area->area_tag
: "null");
circuits_json = json_object_new_array();
json_object_object_add(area_json,
"circuits",
circuits_json);
for (ALL_LIST_ELEMENTS_RO(
area->circuit_list, cnode,
circuit)) {
circuit_json =
json_object_new_object();
json_object_int_add(
circuit_json, "circuit",
circuit->circuit_id);
if (!ifname)
isis_circuit_print_json(
circuit,
circuit_json,
detail);
else if (strcmp(circuit->interface->name, ifname) == 0)
isis_circuit_print_json(
circuit,
circuit_json,
detail);
json_object_array_add(
circuits_json,
circuit_json);
}
json_object_array_add(areas_json,
area_json);
}
}
return CMD_SUCCESS;
}
isis = isis_lookup_by_vrfname(vrf_name);
if (isis != NULL) {
areas_json = json_object_new_array(); areas_json = json_object_new_array();
json_object_object_add(json, "areas", areas_json); json_object_object_add(json, "areas", areas_json);
for (ALL_LIST_ELEMENTS_RO(isis->area_list, anode, for (ALL_LIST_ELEMENTS_RO(isis->area_list, anode, area)) {
area)) {
area_json = json_object_new_object(); area_json = json_object_new_object();
json_object_string_add(area_json, "area", json_object_string_add(area_json, "area",
area->area_tag area->area_tag
? area->area_tag ? area->area_tag
: "null"); : "null");
circuits_json = json_object_new_array(); circuits_json = json_object_new_array();
json_object_object_add(area_json, "circuits", json_object_object_add(area_json, "circuits",
circuits_json); circuits_json);
@ -1055,14 +1009,13 @@ int show_isis_interface_common_json(struct json_object *json,
circuit_json, "circuit", circuit_json, "circuit",
circuit->circuit_id); circuit->circuit_id);
if (!ifname) if (!ifname)
isis_circuit_print_json( isis_circuit_print_json(circuit,
circuit, circuit_json, circuit_json,
detail); detail);
else if ( else if (strcmp(circuit->interface->name,
strcmp(circuit->interface->name,
ifname) == 0) ifname) == 0)
isis_circuit_print_json( isis_circuit_print_json(circuit,
circuit, circuit_json, circuit_json,
detail); detail);
json_object_array_add(circuits_json, json_object_array_add(circuits_json,
circuit_json); circuit_json);
@ -1070,7 +1023,42 @@ int show_isis_interface_common_json(struct json_object *json,
json_object_array_add(areas_json, area_json); json_object_array_add(areas_json, area_json);
} }
} }
return CMD_SUCCESS;
} }
isis = isis_lookup_by_vrfname(vrf_name);
if (isis != NULL) {
areas_json = json_object_new_array();
json_object_object_add(json, "areas", areas_json);
for (ALL_LIST_ELEMENTS_RO(isis->area_list, anode, area)) {
area_json = json_object_new_object();
json_object_string_add(area_json, "area",
area->area_tag ? area->area_tag
: "null");
circuits_json = json_object_new_array();
json_object_object_add(area_json, "circuits",
circuits_json);
for (ALL_LIST_ELEMENTS_RO(area->circuit_list, cnode,
circuit)) {
circuit_json = json_object_new_object();
json_object_int_add(circuit_json, "circuit",
circuit->circuit_id);
if (!ifname)
isis_circuit_print_json(circuit,
circuit_json,
detail);
else if (strcmp(circuit->interface->name,
ifname) == 0)
isis_circuit_print_json(circuit,
circuit_json,
detail);
json_object_array_add(circuits_json,
circuit_json);
}
json_object_array_add(areas_json, area_json);
}
}
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -1087,37 +1075,10 @@ int show_isis_interface_common_vty(struct vty *vty, const char *ifname,
vty_out(vty, "IS-IS Routing Process not enabled\n"); vty_out(vty, "IS-IS Routing Process not enabled\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
if (vrf_name) {
if (all_vrf) { if (all_vrf) {
for (ALL_LIST_ELEMENTS_RO(im->isis, inode, isis)) { for (ALL_LIST_ELEMENTS_RO(im->isis, inode, isis)) {
for (ALL_LIST_ELEMENTS_RO(isis->area_list, for (ALL_LIST_ELEMENTS_RO(isis->area_list, anode, area)) {
anode, area)) {
vty_out(vty, "Area %s:\n",
area->area_tag);
if (detail == ISIS_UI_LEVEL_BRIEF)
vty_out(vty,
" Interface CircId State Type Level\n");
for (ALL_LIST_ELEMENTS_RO(
area->circuit_list, cnode,
circuit))
if (!ifname)
isis_circuit_print_vty(
circuit, vty,
detail);
else if (strcmp(circuit->interface->name, ifname) == 0)
isis_circuit_print_vty(
circuit, vty,
detail);
}
}
return CMD_SUCCESS;
}
isis = isis_lookup_by_vrfname(vrf_name);
if (isis != NULL) {
for (ALL_LIST_ELEMENTS_RO(isis->area_list, anode,
area)) {
vty_out(vty, "Area %s:\n", area->area_tag); vty_out(vty, "Area %s:\n", area->area_tag);
if (detail == ISIS_UI_LEVEL_BRIEF) if (detail == ISIS_UI_LEVEL_BRIEF)
@ -1127,15 +1088,37 @@ int show_isis_interface_common_vty(struct vty *vty, const char *ifname,
for (ALL_LIST_ELEMENTS_RO(area->circuit_list, for (ALL_LIST_ELEMENTS_RO(area->circuit_list,
cnode, circuit)) cnode, circuit))
if (!ifname) if (!ifname)
isis_circuit_print_vty( isis_circuit_print_vty(circuit,
circuit, vty, detail); vty,
else if ( detail);
strcmp(circuit->interface->name, else if (strcmp(circuit->interface->name,
ifname) == 0) ifname) == 0)
isis_circuit_print_vty( isis_circuit_print_vty(circuit,
circuit, vty, detail); vty,
detail);
} }
} }
return CMD_SUCCESS;
}
isis = isis_lookup_by_vrfname(vrf_name);
if (isis != NULL) {
for (ALL_LIST_ELEMENTS_RO(isis->area_list, anode, area)) {
vty_out(vty, "Area %s:\n", area->area_tag);
if (detail == ISIS_UI_LEVEL_BRIEF)
vty_out(vty,
" Interface CircId State Type Level\n");
for (ALL_LIST_ELEMENTS_RO(area->circuit_list, cnode,
circuit))
if (!ifname)
isis_circuit_print_vty(circuit, vty,
detail);
else if (strcmp(circuit->interface->name,
ifname) == 0)
isis_circuit_print_vty(circuit, vty,
detail);
}
} }
return CMD_SUCCESS; return CMD_SUCCESS;
@ -1376,16 +1359,13 @@ int show_isis_neighbor_common(struct vty *vty, struct json_object *json,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
if (vrf_name) {
if (all_vrf) { if (all_vrf) {
for (ALL_LIST_ELEMENTS_RO(im->isis, node, isis)) { for (ALL_LIST_ELEMENTS_RO(im->isis, node, isis)) {
if (id_to_sysid(isis, id, sysid)) { if (id_to_sysid(isis, id, sysid)) {
vty_out(vty, "Invalid system id %s\n", vty_out(vty, "Invalid system id %s\n", id);
id);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
isis_neighbor_common(vty, json, id, detail, isis_neighbor_common(vty, json, id, detail, isis, sysid);
isis, sysid);
} }
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -1395,9 +1375,7 @@ int show_isis_neighbor_common(struct vty *vty, struct json_object *json,
vty_out(vty, "Invalid system id %s\n", id); vty_out(vty, "Invalid system id %s\n", id);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
isis_neighbor_common(vty, json, id, detail, isis, isis_neighbor_common(vty, json, id, detail, isis, sysid);
sysid);
}
} }
return CMD_SUCCESS; return CMD_SUCCESS;
@ -1461,16 +1439,13 @@ int clear_isis_neighbor_common(struct vty *vty, const char *id, const char *vrf_
return CMD_SUCCESS; return CMD_SUCCESS;
} }
if (vrf_name) {
if (all_vrf) { if (all_vrf) {
for (ALL_LIST_ELEMENTS_RO(im->isis, node, isis)) { for (ALL_LIST_ELEMENTS_RO(im->isis, node, isis)) {
if (id_to_sysid(isis, id, sysid)) { if (id_to_sysid(isis, id, sysid)) {
vty_out(vty, "Invalid system id %s\n", vty_out(vty, "Invalid system id %s\n", id);
id);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
isis_neighbor_common_clear(vty, id, sysid, isis_neighbor_common_clear(vty, id, sysid, isis);
isis);
} }
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -1482,7 +1457,6 @@ int clear_isis_neighbor_common(struct vty *vty, const char *id, const char *vrf_
} }
isis_neighbor_common_clear(vty, id, sysid, isis); isis_neighbor_common_clear(vty, id, sysid, isis);
} }
}
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -2234,7 +2208,7 @@ DEFUN (show_hostname,
struct isis *isis; struct isis *isis;
ISIS_FIND_VRF_ARGS(argv, argc, idx_vrf, vrf_name, all_vrf); ISIS_FIND_VRF_ARGS(argv, argc, idx_vrf, vrf_name, all_vrf);
if (vrf_name) {
if (all_vrf) { if (all_vrf) {
for (ALL_LIST_ELEMENTS_RO(im->isis, node, isis)) for (ALL_LIST_ELEMENTS_RO(im->isis, node, isis))
dynhn_print_all(vty, isis); dynhn_print_all(vty, isis);
@ -2244,7 +2218,6 @@ DEFUN (show_hostname,
isis = isis_lookup_by_vrfname(vrf_name); isis = isis_lookup_by_vrfname(vrf_name);
if (isis != NULL) if (isis != NULL)
dynhn_print_all(vty, isis); dynhn_print_all(vty, isis);
}
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -2307,7 +2280,6 @@ DEFUN(show_isis_spf_ietf, show_isis_spf_ietf_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
if (vrf_name) {
if (all_vrf) { if (all_vrf) {
for (ALL_LIST_ELEMENTS_RO(im->isis, node, isis)) for (ALL_LIST_ELEMENTS_RO(im->isis, node, isis))
isis_spf_ietf_common(vty, isis); isis_spf_ietf_common(vty, isis);
@ -2317,7 +2289,6 @@ DEFUN(show_isis_spf_ietf, show_isis_spf_ietf_cmd,
isis = isis_lookup_by_vrfname(vrf_name); isis = isis_lookup_by_vrfname(vrf_name);
if (isis != NULL) if (isis != NULL)
isis_spf_ietf_common(vty, isis); isis_spf_ietf_common(vty, isis);
}
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -2596,7 +2567,7 @@ DEFUN(show_isis_summary, show_isis_summary_cmd,
} }
if (uj) if (uj)
json = json_object_new_object(); json = json_object_new_object();
if (vrf_name) {
if (all_vrf) { if (all_vrf) {
for (ALL_LIST_ELEMENTS_RO(im->isis, node, isis)) for (ALL_LIST_ELEMENTS_RO(im->isis, node, isis))
common_isis_summary(vty, json, isis); common_isis_summary(vty, json, isis);
@ -2606,7 +2577,6 @@ DEFUN(show_isis_summary, show_isis_summary_cmd,
isis = isis_lookup_by_vrfname(vrf_name); isis = isis_lookup_by_vrfname(vrf_name);
if (isis != NULL) if (isis != NULL)
common_isis_summary(vty, json, isis); common_isis_summary(vty, json, isis);
}
if (uj) if (uj)
vty_json(vty, json); vty_json(vty, json);
@ -2828,7 +2798,6 @@ static int show_isis_database(struct vty *vty, struct json_object *json, const c
struct listnode *node; struct listnode *node;
struct isis *isis; struct isis *isis;
if (vrf_name) {
if (all_vrf) { if (all_vrf) {
for (ALL_LIST_ELEMENTS_RO(im->isis, node, isis)) for (ALL_LIST_ELEMENTS_RO(im->isis, node, isis))
show_isis_database_common(vty, json, sysid_str, show_isis_database_common(vty, json, sysid_str,
@ -2838,9 +2807,7 @@ static int show_isis_database(struct vty *vty, struct json_object *json, const c
} }
isis = isis_lookup_by_vrfname(vrf_name); isis = isis_lookup_by_vrfname(vrf_name);
if (isis) if (isis)
show_isis_database_common(vty, json, sysid_str, show_isis_database_common(vty, json, sysid_str, ui_level, isis);
ui_level, isis);
}
return CMD_SUCCESS; return CMD_SUCCESS;
} }