Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix rip/ripng yang rpcs #15510

Merged
merged 2 commits into from
Mar 9, 2024
Merged

fix rip/ripng yang rpcs #15510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ba9751
ripd: fix "clear ip rip" command
idryzhov Mar 8, 2024
c544b9e
ripngd: fix "clear ipv6 ripng" command
idryzhov Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions ripd/rip_cli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,36 +1125,6 @@ void cli_show_ip_rip_bfd_profile(struct vty *vty, const struct lyd_node *dnode,
yang_dnode_get_string(dnode, NULL));
}

/*
* XPath: /frr-ripd:clear-rip-route
*/
DEFPY_YANG (clear_ip_rip,
clear_ip_rip_cmd,
"clear ip rip [vrf WORD]",
CLEAR_STR
IP_STR
"Clear IP RIP database\n"
VRF_CMD_HELP_STR)
{
struct list *input;
int ret;

input = list_new();
if (vrf) {
struct yang_data *yang_vrf;

yang_vrf = yang_data_new("/frr-ripd:clear-rip-route/input/vrf",
vrf);
listnode_add(input, yang_vrf);
}

ret = nb_cli_rpc(vty, "/frr-ripd:clear-rip-route", input, NULL);

list_delete(&input);

return ret;
}

DEFPY_YANG(
rip_distribute_list, rip_distribute_list_cmd,
"distribute-list ACCESSLIST4_NAME$name <in|out>$dir [WORD$ifname]",
Expand Down Expand Up @@ -1325,8 +1295,6 @@ void rip_cli_init(void)
install_element(INTERFACE_NODE, &ip_rip_bfd_profile_cmd);
install_element(INTERFACE_NODE, &no_ip_rip_bfd_profile_cmd);

install_element(ENABLE_NODE, &clear_ip_rip_cmd);

if_rmap_init(RIP_NODE);
}
/* clang-format off */
Expand Down
33 changes: 33 additions & 0 deletions ripd/ripd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3254,6 +3254,38 @@ DEFUN (show_ip_rip_status,
return CMD_SUCCESS;
}

#include "ripd/ripd_clippy.c"

/*
* XPath: /frr-ripd:clear-rip-route
*/
DEFPY_YANG (clear_ip_rip,
clear_ip_rip_cmd,
"clear ip rip [vrf WORD]",
CLEAR_STR
IP_STR
"Clear IP RIP database\n"
VRF_CMD_HELP_STR)
{
struct list *input;
int ret;

input = list_new();
if (vrf) {
struct yang_data *yang_vrf;

yang_vrf = yang_data_new("/frr-ripd:clear-rip-route/input/vrf",
vrf);
listnode_add(input, yang_vrf);
}

ret = nb_cli_rpc(vty, "/frr-ripd:clear-rip-route", input, NULL);

list_delete(&input);

return ret;
}

/* Distribute-list update functions. */
static void rip_distribute_update(struct distribute_ctx *ctx,
struct distribute *dist)
Expand Down Expand Up @@ -3628,6 +3660,7 @@ void rip_init(void)
/* Install rip commands. */
install_element(VIEW_NODE, &show_ip_rip_cmd);
install_element(VIEW_NODE, &show_ip_rip_status_cmd);
install_element(ENABLE_NODE, &clear_ip_rip_cmd);

/* Debug related init. */
rip_debug_init();
Expand Down
1 change: 1 addition & 0 deletions ripd/subdir.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ ripd_ripd_SOURCES = \
clippy_scan += \
ripd/rip_bfd.c \
ripd/rip_cli.c \
ripd/ripd.c \
# end

noinst_HEADERS += \
Expand Down
32 changes: 0 additions & 32 deletions ripngd/ripng_cli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,36 +512,6 @@ void cli_show_ipv6_ripng_split_horizon(struct vty *vty,
}
}

/*
* XPath: /frr-ripngd:clear-ripng-route
*/
DEFPY_YANG (clear_ipv6_rip,
clear_ipv6_rip_cmd,
"clear ipv6 ripng [vrf WORD]",
CLEAR_STR
IPV6_STR
"Clear IPv6 RIP database\n"
VRF_CMD_HELP_STR)
{
struct list *input;
int ret;

input = list_new();
if (vrf) {
struct yang_data *yang_vrf;

yang_vrf = yang_data_new(
"/frr-ripngd:clear-ripng-route/input/vrf", vrf);
listnode_add(input, yang_vrf);
}

ret = nb_cli_rpc(vty, "/frr-ripngd:clear-ripng-route", input, NULL);

list_delete(&input);

return ret;
}

DEFPY_YANG(
ripng_ipv6_distribute_list, ripng_ipv6_distribute_list_cmd,
"ipv6 distribute-list ACCESSLIST6_NAME$name <in|out>$dir [WORD$ifname]",
Expand Down Expand Up @@ -693,8 +663,6 @@ void ripng_cli_init(void)

install_element(INTERFACE_NODE, &ipv6_ripng_split_horizon_cmd);

install_element(ENABLE_NODE, &clear_ipv6_rip_cmd);

if_rmap_init(RIPNG_NODE);
}

Expand Down
33 changes: 33 additions & 0 deletions ripngd/ripngd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2231,6 +2231,38 @@ DEFUN (show_ipv6_ripng_status,
return CMD_SUCCESS;
}

#include "ripngd/ripngd_clippy.c"

/*
* XPath: /frr-ripngd:clear-ripng-route
*/
DEFPY_YANG (clear_ipv6_rip,
clear_ipv6_rip_cmd,
"clear ipv6 ripng [vrf WORD]",
CLEAR_STR
IPV6_STR
"Clear IPv6 RIP database\n"
VRF_CMD_HELP_STR)
{
struct list *input;
int ret;

input = list_new();
if (vrf) {
struct yang_data *yang_vrf;

yang_vrf = yang_data_new(
"/frr-ripngd:clear-ripng-route/input/vrf", vrf);
listnode_add(input, yang_vrf);
}

ret = nb_cli_rpc(vty, "/frr-ripngd:clear-ripng-route", input, NULL);

list_delete(&input);

return ret;
}

/* Update ECMP routes to zebra when ECMP is disabled. */
void ripng_ecmp_disable(struct ripng *ripng)
{
Expand Down Expand Up @@ -2648,6 +2680,7 @@ void ripng_init(void)
/* Install ripng commands. */
install_element(VIEW_NODE, &show_ipv6_ripng_cmd);
install_element(VIEW_NODE, &show_ipv6_ripng_status_cmd);
install_element(ENABLE_NODE, &clear_ipv6_rip_cmd);

ripng_if_init();
ripng_debug_init();
Expand Down
1 change: 1 addition & 0 deletions ripngd/subdir.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ ripngd_ripngd_SOURCES = \

clippy_scan += \
ripngd/ripng_cli.c \
ripngd/ripngd.c \
# end

noinst_HEADERS += \
Expand Down
Loading