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

isisd: remove useless checks from cli

Browse Source 
is-type defaults to level-1-2 for more than a year already.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2021-04-26 16:48:11 +03:00
parent ec62fbaa07
commit 25fe5b0fe8
1 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
isisd/isis_cli.c
View File

@ -62,19 +62,7 @@ DEFPY_YANG_NOSH(router_isis, router_isis_cmd,
"/frr-isisd:isis/instance[area-tag='%s'][vrf='%s']", tag, "/frr-isisd:isis/instance[area-tag='%s'][vrf='%s']", tag,
vrf_name); vrf_name);
nb_cli_enqueue_change(vty, ".", NB_OP_CREATE, NULL); nb_cli_enqueue_change(vty, ".", NB_OP_CREATE, NULL);
/* default value in yang for is-type is level-1, but in FRR
* the first instance is assigned is-type level-1-2. We
* need to make sure to set it in the yang model so that it
* is consistent with what FRR sees.
*/
if (!im) {
return CMD_SUCCESS;
}
if (listcount(im->isis) == 0)
nb_cli_enqueue_change(vty, "./is-type", NB_OP_MODIFY,
"level-1-2");
ret = nb_cli_apply_changes(vty, base_xpath); ret = nb_cli_apply_changes(vty, base_xpath);
if (ret == CMD_SUCCESS) if (ret == CMD_SUCCESS)
VTY_PUSH_XPATH(ISIS_NODE, base_xpath); VTY_PUSH_XPATH(ISIS_NODE, base_xpath);
@ -190,13 +178,6 @@ DEFPY_YANG(ip_router_isis, ip_router_isis_cmd,
"/frr-isisd:isis/instance[area-tag='%s'][vrf='%s']", "/frr-isisd:isis/instance[area-tag='%s'][vrf='%s']",
tag, vrf_name); tag, vrf_name);
nb_cli_enqueue_change(vty, temp_xpath, NB_OP_CREATE, tag); nb_cli_enqueue_change(vty, temp_xpath, NB_OP_CREATE, tag);
snprintf(
temp_xpath, XPATH_MAXLEN,
"/frr-isisd:isis/instance[area-tag='%s'][vrf='%s']/is-type",
tag, vrf_name);
nb_cli_enqueue_change(vty, temp_xpath, NB_OP_MODIFY,
listcount(im->isis) == 0 ? "level-1-2"
: NULL);
nb_cli_enqueue_change(vty, "./frr-isisd:isis", NB_OP_CREATE, nb_cli_enqueue_change(vty, "./frr-isisd:isis", NB_OP_CREATE,
NULL); NULL);
nb_cli_enqueue_change(vty, "./frr-isisd:isis/area-tag", nb_cli_enqueue_change(vty, "./frr-isisd:isis/area-tag",
@ -206,9 +187,6 @@ DEFPY_YANG(ip_router_isis, ip_router_isis_cmd,
vrf_name); vrf_name);
nb_cli_enqueue_change(vty, "./frr-isisd:isis/ipv4-routing", nb_cli_enqueue_change(vty, "./frr-isisd:isis/ipv4-routing",
NB_OP_MODIFY, "true"); NB_OP_MODIFY, "true");
nb_cli_enqueue_change(
vty, "./frr-isisd:isis/circuit-type", NB_OP_MODIFY,
listcount(im->isis) == 0 ? "level-1-2" : "level-1");
} else { } else {
/* area exists, circuit type defaults to its area's is_type */ /* area exists, circuit type defaults to its area's is_type */
switch (area->is_type) { switch (area->is_type) {
@ -287,13 +265,6 @@ DEFPY_YANG(ip6_router_isis, ip6_router_isis_cmd,
"/frr-isisd:isis/instance[area-tag='%s'][vrf='%s']", "/frr-isisd:isis/instance[area-tag='%s'][vrf='%s']",
tag, vrf_name); tag, vrf_name);
nb_cli_enqueue_change(vty, temp_xpath, NB_OP_CREATE, tag); nb_cli_enqueue_change(vty, temp_xpath, NB_OP_CREATE, tag);
snprintf(
temp_xpath, XPATH_MAXLEN,
"/frr-isisd:isis/instance[area-tag='%s'][vrf='%s']/is-type",
tag, vrf_name);
nb_cli_enqueue_change(vty, temp_xpath, NB_OP_MODIFY,
listcount(im->isis) == 0 ? "level-1-2"
: NULL);
nb_cli_enqueue_change(vty, "./frr-isisd:isis", NB_OP_CREATE, nb_cli_enqueue_change(vty, "./frr-isisd:isis", NB_OP_CREATE,
NULL); NULL);
nb_cli_enqueue_change(vty, "./frr-isisd:isis/area-tag", nb_cli_enqueue_change(vty, "./frr-isisd:isis/area-tag",
@ -303,9 +274,6 @@ DEFPY_YANG(ip6_router_isis, ip6_router_isis_cmd,
nb_cli_enqueue_change(vty, "./frr-isisd:isis/ipv6-routing", nb_cli_enqueue_change(vty, "./frr-isisd:isis/ipv6-routing",
NB_OP_MODIFY, "true"); NB_OP_MODIFY, "true");
nb_cli_enqueue_change(
vty, "./frr-isisd:isis/circuit-type", NB_OP_MODIFY,
listcount(im->isis) == 0 ? "level-1-2" : "level-1");
} else { } else {
/* area exists, circuit type defaults to its area's is_type */ /* area exists, circuit type defaults to its area's is_type */
switch (area->is_type) { switch (area->is_type) {