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

bfdd: fix nb cli show with defaults

Browse Source 
The idea of the "with-defaults" flag is to show the default values for
parameters that were not configured by the user. But bfdd incorrectly
shows the default values for all parameters, including the
user-configured ones.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2021-04-12 14:17:30 +03:00
parent 8435eae7bb
commit 613bcbc5d5
1 changed files with 20 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
bfdd/bfdd_cli.c
View File

@ -273,11 +273,8 @@ DEFPY_YANG(
void bfd_cli_show_shutdown(struct vty *vty, struct lyd_node *dnode, void bfd_cli_show_shutdown(struct vty *vty, struct lyd_node *dnode,
bool show_defaults) bool show_defaults)
{ {
if (show_defaults) vty_out(vty, " %sshutdown\n",
vty_out(vty, " no shutdown\n"); yang_dnode_get_bool(dnode, NULL) ? "" : "no ");
else
vty_out(vty, " %sshutdown\n",
yang_dnode_get_bool(dnode, NULL) ? "" : "no ");
} }
DEFPY_YANG( DEFPY_YANG(
@ -294,11 +291,8 @@ DEFPY_YANG(
void bfd_cli_show_passive(struct vty *vty, struct lyd_node *dnode, void bfd_cli_show_passive(struct vty *vty, struct lyd_node *dnode,
bool show_defaults) bool show_defaults)
{ {
if (show_defaults) vty_out(vty, " %spassive-mode\n",
vty_out(vty, " no passive-mode\n"); yang_dnode_get_bool(dnode, NULL) ? "" : "no ");
else
vty_out(vty, " %spassive-mode\n",
yang_dnode_get_bool(dnode, NULL) ? "" : "no ");
} }
DEFPY_YANG( DEFPY_YANG(
@ -335,11 +329,7 @@ DEFPY_YANG(
void bfd_cli_show_minimum_ttl(struct vty *vty, struct lyd_node *dnode, void bfd_cli_show_minimum_ttl(struct vty *vty, struct lyd_node *dnode,
bool show_defaults) bool show_defaults)
{ {
if (show_defaults) vty_out(vty, " minimum-ttl %s\n", yang_dnode_get_string(dnode, NULL));
vty_out(vty, " minimum-ttl 254\n");
else
vty_out(vty, " minimum-ttl %s\n",
yang_dnode_get_string(dnode, NULL));
} }
DEFPY_YANG( DEFPY_YANG(
@ -356,12 +346,8 @@ DEFPY_YANG(
void bfd_cli_show_mult(struct vty *vty, struct lyd_node *dnode, void bfd_cli_show_mult(struct vty *vty, struct lyd_node *dnode,
bool show_defaults) bool show_defaults)
{ {
if (show_defaults) vty_out(vty, " detect-multiplier %s\n",
vty_out(vty, " detect-multiplier %d\n", yang_dnode_get_string(dnode, NULL));
BFD_DEFDETECTMULT);
else
vty_out(vty, " detect-multiplier %s\n",
yang_dnode_get_string(dnode, NULL));
} }
DEFPY_YANG( DEFPY_YANG(
@ -382,15 +368,9 @@ DEFPY_YANG(
void bfd_cli_show_rx(struct vty *vty, struct lyd_node *dnode, void bfd_cli_show_rx(struct vty *vty, struct lyd_node *dnode,
bool show_defaults) bool show_defaults)
{ {
uint32_t value; uint32_t value = yang_dnode_get_uint32(dnode, NULL);
if (show_defaults) vty_out(vty, " receive-interval %u\n", value / 1000);
vty_out(vty, " receive-interval %d\n",
BFD_DEFREQUIREDMINRX);
else {
value = yang_dnode_get_uint32(dnode, NULL);
vty_out(vty, " receive-interval %u\n", value / 1000);
}
} }
DEFPY_YANG( DEFPY_YANG(
@ -411,15 +391,9 @@ DEFPY_YANG(
void bfd_cli_show_tx(struct vty *vty, struct lyd_node *dnode, void bfd_cli_show_tx(struct vty *vty, struct lyd_node *dnode,
bool show_defaults) bool show_defaults)
{ {
uint32_t value; uint32_t value = yang_dnode_get_uint32(dnode, NULL);
if (show_defaults) vty_out(vty, " transmit-interval %u\n", value / 1000);
vty_out(vty, " transmit-interval %d\n",
BFD_DEFDESIREDMINTX);
else {
value = yang_dnode_get_uint32(dnode, NULL);
vty_out(vty, " transmit-interval %u\n", value / 1000);
}
} }
DEFPY_YANG( DEFPY_YANG(
@ -445,11 +419,8 @@ DEFPY_YANG(
void bfd_cli_show_echo(struct vty *vty, struct lyd_node *dnode, void bfd_cli_show_echo(struct vty *vty, struct lyd_node *dnode,
bool show_defaults) bool show_defaults)
{ {
if (show_defaults) vty_out(vty, " %secho-mode\n",
vty_out(vty, " no echo-mode\n"); yang_dnode_get_bool(dnode, NULL) ? "" : "no ");
else
vty_out(vty, " %secho-mode\n",
yang_dnode_get_bool(dnode, NULL) ? "" : "no ");
} }
DEFPY_YANG( DEFPY_YANG(
@ -498,15 +469,9 @@ DEFPY_YANG(
void bfd_cli_show_desired_echo_transmission_interval(struct vty *vty, void bfd_cli_show_desired_echo_transmission_interval(struct vty *vty,
struct lyd_node *dnode, bool show_defaults) struct lyd_node *dnode, bool show_defaults)
{ {
uint32_t value; uint32_t value = yang_dnode_get_uint32(dnode, NULL);
if (show_defaults) vty_out(vty, " echo transmit-interval %u\n", value / 1000);
vty_out(vty, " echo transmit-interval %d\n",
BFD_DEF_DES_MIN_ECHO_TX);
else {
value = yang_dnode_get_uint32(dnode, NULL);
vty_out(vty, " echo transmit-interval %u\n", value / 1000);
}
} }
DEFPY_YANG( DEFPY_YANG(
@ -538,19 +503,12 @@ DEFPY_YANG(
void bfd_cli_show_required_echo_receive_interval(struct vty *vty, void bfd_cli_show_required_echo_receive_interval(struct vty *vty,
struct lyd_node *dnode, bool show_defaults) struct lyd_node *dnode, bool show_defaults)
{ {
uint32_t value; uint32_t value = yang_dnode_get_uint32(dnode, NULL);
if (show_defaults) if (value)
vty_out(vty, " echo receive-interval %d\n", vty_out(vty, " echo receive-interval %u\n", value / 1000);
BFD_DEF_REQ_MIN_ECHO_RX); else
else { vty_out(vty, " echo receive-interval disabled\n");
value = yang_dnode_get_uint32(dnode, NULL);
if (value)
vty_out(vty, " echo receive-interval %u\n",
value / 1000);
else
vty_out(vty, " echo receive-interval disabled\n");
}
} }
/* /*