Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 21:47:15 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
frr/ripd/rip_cli.c

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

1223 lines
33 KiB
C
Raw Normal View History

*: auto-convert to SPDX License IDs Done with a combination of regex'ing and banging my head against a wall. Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2023-02-08 13:17:09 +01:00
// SPDX-License-Identifier: GPL-2.0-or-later
yang, ripd: add 'frr-ripd.yang' and associated stub callbacks Introduce frr-ripd.yang, which defines a model for managing the FRR ripd daemon. Also add frr-route-types.yang which defines typedefs for FRR route types. Update the 'frr_yang_module_info' array of ripd with the new 'frr-ripd' module. Add two new files (rip_cli.[ch]) which should contain all ripd commands converted to the new northbound model. Centralizing all commands in a single place will facilitate the process of moving the CLI to a separate program in the future. Add automatically generated stub callbacks in rip_northbound.c. These callbacks will be implemented gradually in the following commits. Add example JSON/XML ripd configurations in yang/examples/. Add the confd.frr-ripd.yang YANG module with annotations specific to the ConfD daemon. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:57 +02:00
/*
* Copyright (C) 1997, 1998, 1999 Kunihiro Ishiguro <kunihiro@zebra.org>
* Copyright (C) 2018 NetDEF, Inc.
* Renato Westphal
*/
#include <zebra.h>
#include "if.h"
#include "vrf.h"
#include "log.h"
#include "prefix.h"
#include "command.h"
#include "northbound_cli.h"
#include "libfrr.h"
#include "ripd/ripd.h"
ripd: split northbound callbacks into multiple files Rearrange the ripd northbound callbacks as following: * rip_nb.h: prototypes of all northbound callbacks. * rip_nb.c: definition of all northbound callbacks and their associated YANG data paths. * rip_nb_config.c: implementation of YANG configuration nodes. * rip_nb_state.c: implementation of YANG state nodes. * rip_nb_rpcs.c: implementation of YANG RPCs. * rip_nb_notifications.c: implementation of YANG notifications. This should help to keep to code more organized and easier to maintain. No behavior changes intended. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2019-10-17 20:46:54 +02:00
#include "ripd/rip_nb.h"
yang, ripd: add 'frr-ripd.yang' and associated stub callbacks Introduce frr-ripd.yang, which defines a model for managing the FRR ripd daemon. Also add frr-route-types.yang which defines typedefs for FRR route types. Update the 'frr_yang_module_info' array of ripd with the new 'frr-ripd' module. Add two new files (rip_cli.[ch]) which should contain all ripd commands converted to the new northbound model. Centralizing all commands in a single place will facilitate the process of moving the CLI to a separate program in the future. Add automatically generated stub callbacks in rip_northbound.c. These callbacks will be implemented gradually in the following commits. Add example JSON/XML ripd configurations in yang/examples/. Add the confd.frr-ripd.yang YANG module with annotations specific to the ConfD daemon. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:57 +02:00
#include "ripd/rip_cli_clippy.c"
ripd: retrofit the 'router rip' command to the new northbound model * Implement the northbound callbacks associated to the '/frr-ripd:ripd/instance' YANG path (the code is mostly a copy and paste from the original "router rip" DEFUNs); * Move rip_create_socket() out of rip_create() since creating a socket is an error-prone operation and thus needs to be performed separately during the NB_EV_PREPARE phase; * On rip_create(), fetch the defaults from the frr-ripd YANG model; * Convert the "[no] router rip" CLI commands to be dumb wrappers around the northbound callbacks; * On config_write_rip(), write logic to call all 'cli_show' northbound callbacks defined under the '/frr-ripd:ripd/instance' YANG path. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
/*
* XPath: /frr-ripd:ripd/instance
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG_NOSH (router_rip,
ripd: retrofit the 'router rip' command to the new northbound model * Implement the northbound callbacks associated to the '/frr-ripd:ripd/instance' YANG path (the code is mostly a copy and paste from the original "router rip" DEFUNs); * Move rip_create_socket() out of rip_create() since creating a socket is an error-prone operation and thus needs to be performed separately during the NB_EV_PREPARE phase; * On rip_create(), fetch the defaults from the frr-ripd YANG model; * Convert the "[no] router rip" CLI commands to be dumb wrappers around the northbound callbacks; * On config_write_rip(), write logic to call all 'cli_show' northbound callbacks defined under the '/frr-ripd:ripd/instance' YANG path. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
router_rip_cmd,
ripd: add VRF support * Turn the "instance" YANG presence-container into a YANG list keyed by the new "vrf" leaf. This is a backward incompatible change but this should be ok for now. * RIP VRF instances can be configured even when the corresponding VRF doesn't exist. And a RIP VRF instance isn't deleted when the corresponding VRF is deleted. For this to work, implement the rip_instance_enable() and rip_instance_disable() functions that are called to enable/disable RIP routing instances when necessary. A RIP routing instance can be enabled only when the corresponding VRF is enabled (this information comes from zebra and depends on the underlying VRF backend). Routing instances are stored in the new rip_instances rb-tree (global variable). * Add a vrf pointer to the rip structure instead of storing vrf_id only. This is much more convenient than using vrf_lookup_by_id() every time we need to get the vrf pointer from the VRF ID. The rip->vrf pointer is updated whenever the VRF enable/disable hooks are called. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2019-01-04 22:08:10 +01:00
"router rip [vrf NAME]",
ripd: retrofit the 'router rip' command to the new northbound model * Implement the northbound callbacks associated to the '/frr-ripd:ripd/instance' YANG path (the code is mostly a copy and paste from the original "router rip" DEFUNs); * Move rip_create_socket() out of rip_create() since creating a socket is an error-prone operation and thus needs to be performed separately during the NB_EV_PREPARE phase; * On rip_create(), fetch the defaults from the frr-ripd YANG model; * Convert the "[no] router rip" CLI commands to be dumb wrappers around the northbound callbacks; * On config_write_rip(), write logic to call all 'cli_show' northbound callbacks defined under the '/frr-ripd:ripd/instance' YANG path. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
"Enable a routing process\n"
ripd: add VRF support * Turn the "instance" YANG presence-container into a YANG list keyed by the new "vrf" leaf. This is a backward incompatible change but this should be ok for now. * RIP VRF instances can be configured even when the corresponding VRF doesn't exist. And a RIP VRF instance isn't deleted when the corresponding VRF is deleted. For this to work, implement the rip_instance_enable() and rip_instance_disable() functions that are called to enable/disable RIP routing instances when necessary. A RIP routing instance can be enabled only when the corresponding VRF is enabled (this information comes from zebra and depends on the underlying VRF backend). Routing instances are stored in the new rip_instances rb-tree (global variable). * Add a vrf pointer to the rip structure instead of storing vrf_id only. This is much more convenient than using vrf_lookup_by_id() every time we need to get the vrf pointer from the VRF ID. The rip->vrf pointer is updated whenever the VRF enable/disable hooks are called. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2019-01-04 22:08:10 +01:00
"Routing Information Protocol (RIP)\n"
VRF_CMD_HELP_STR)
ripd: retrofit the 'router rip' command to the new northbound model * Implement the northbound callbacks associated to the '/frr-ripd:ripd/instance' YANG path (the code is mostly a copy and paste from the original "router rip" DEFUNs); * Move rip_create_socket() out of rip_create() since creating a socket is an error-prone operation and thus needs to be performed separately during the NB_EV_PREPARE phase; * On rip_create(), fetch the defaults from the frr-ripd YANG model; * Convert the "[no] router rip" CLI commands to be dumb wrappers around the northbound callbacks; * On config_write_rip(), write logic to call all 'cli_show' northbound callbacks defined under the '/frr-ripd:ripd/instance' YANG path. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
{
ripd: add VRF support * Turn the "instance" YANG presence-container into a YANG list keyed by the new "vrf" leaf. This is a backward incompatible change but this should be ok for now. * RIP VRF instances can be configured even when the corresponding VRF doesn't exist. And a RIP VRF instance isn't deleted when the corresponding VRF is deleted. For this to work, implement the rip_instance_enable() and rip_instance_disable() functions that are called to enable/disable RIP routing instances when necessary. A RIP routing instance can be enabled only when the corresponding VRF is enabled (this information comes from zebra and depends on the underlying VRF backend). Routing instances are stored in the new rip_instances rb-tree (global variable). * Add a vrf pointer to the rip structure instead of storing vrf_id only. This is much more convenient than using vrf_lookup_by_id() every time we need to get the vrf pointer from the VRF ID. The rip->vrf pointer is updated whenever the VRF enable/disable hooks are called. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2019-01-04 22:08:10 +01:00
char xpath[XPATH_MAXLEN];
ripd: retrofit the 'router rip' command to the new northbound model * Implement the northbound callbacks associated to the '/frr-ripd:ripd/instance' YANG path (the code is mostly a copy and paste from the original "router rip" DEFUNs); * Move rip_create_socket() out of rip_create() since creating a socket is an error-prone operation and thus needs to be performed separately during the NB_EV_PREPARE phase; * On rip_create(), fetch the defaults from the frr-ripd YANG model; * Convert the "[no] router rip" CLI commands to be dumb wrappers around the northbound callbacks; * On config_write_rip(), write logic to call all 'cli_show' northbound callbacks defined under the '/frr-ripd:ripd/instance' YANG path. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
int ret;
ripd: add VRF support * Turn the "instance" YANG presence-container into a YANG list keyed by the new "vrf" leaf. This is a backward incompatible change but this should be ok for now. * RIP VRF instances can be configured even when the corresponding VRF doesn't exist. And a RIP VRF instance isn't deleted when the corresponding VRF is deleted. For this to work, implement the rip_instance_enable() and rip_instance_disable() functions that are called to enable/disable RIP routing instances when necessary. A RIP routing instance can be enabled only when the corresponding VRF is enabled (this information comes from zebra and depends on the underlying VRF backend). Routing instances are stored in the new rip_instances rb-tree (global variable). * Add a vrf pointer to the rip structure instead of storing vrf_id only. This is much more convenient than using vrf_lookup_by_id() every time we need to get the vrf pointer from the VRF ID. The rip->vrf pointer is updated whenever the VRF enable/disable hooks are called. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2019-01-04 22:08:10 +01:00
/* Build RIP instance XPath. */
if (!vrf)
vrf = VRF_DEFAULT_NAME;
snprintf(xpath, sizeof(xpath), "/frr-ripd:ripd/instance[vrf='%s']",
vrf);
nb_cli_enqueue_change(vty, xpath, NB_OP_CREATE, NULL);
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
ret = nb_cli_apply_changes(vty, NULL);
ripd: retrofit the 'router rip' command to the new northbound model * Implement the northbound callbacks associated to the '/frr-ripd:ripd/instance' YANG path (the code is mostly a copy and paste from the original "router rip" DEFUNs); * Move rip_create_socket() out of rip_create() since creating a socket is an error-prone operation and thus needs to be performed separately during the NB_EV_PREPARE phase; * On rip_create(), fetch the defaults from the frr-ripd YANG model; * Convert the "[no] router rip" CLI commands to be dumb wrappers around the northbound callbacks; * On config_write_rip(), write logic to call all 'cli_show' northbound callbacks defined under the '/frr-ripd:ripd/instance' YANG path. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
if (ret == CMD_SUCCESS)
ripd: add VRF support * Turn the "instance" YANG presence-container into a YANG list keyed by the new "vrf" leaf. This is a backward incompatible change but this should be ok for now. * RIP VRF instances can be configured even when the corresponding VRF doesn't exist. And a RIP VRF instance isn't deleted when the corresponding VRF is deleted. For this to work, implement the rip_instance_enable() and rip_instance_disable() functions that are called to enable/disable RIP routing instances when necessary. A RIP routing instance can be enabled only when the corresponding VRF is enabled (this information comes from zebra and depends on the underlying VRF backend). Routing instances are stored in the new rip_instances rb-tree (global variable). * Add a vrf pointer to the rip structure instead of storing vrf_id only. This is much more convenient than using vrf_lookup_by_id() every time we need to get the vrf pointer from the VRF ID. The rip->vrf pointer is updated whenever the VRF enable/disable hooks are called. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2019-01-04 22:08:10 +01:00
VTY_PUSH_XPATH(RIP_NODE, xpath);
ripd: retrofit the 'router rip' command to the new northbound model * Implement the northbound callbacks associated to the '/frr-ripd:ripd/instance' YANG path (the code is mostly a copy and paste from the original "router rip" DEFUNs); * Move rip_create_socket() out of rip_create() since creating a socket is an error-prone operation and thus needs to be performed separately during the NB_EV_PREPARE phase; * On rip_create(), fetch the defaults from the frr-ripd YANG model; * Convert the "[no] router rip" CLI commands to be dumb wrappers around the northbound callbacks; * On config_write_rip(), write logic to call all 'cli_show' northbound callbacks defined under the '/frr-ripd:ripd/instance' YANG path. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
return ret;
}
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (no_router_rip,
ripd: retrofit the 'router rip' command to the new northbound model * Implement the northbound callbacks associated to the '/frr-ripd:ripd/instance' YANG path (the code is mostly a copy and paste from the original "router rip" DEFUNs); * Move rip_create_socket() out of rip_create() since creating a socket is an error-prone operation and thus needs to be performed separately during the NB_EV_PREPARE phase; * On rip_create(), fetch the defaults from the frr-ripd YANG model; * Convert the "[no] router rip" CLI commands to be dumb wrappers around the northbound callbacks; * On config_write_rip(), write logic to call all 'cli_show' northbound callbacks defined under the '/frr-ripd:ripd/instance' YANG path. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
no_router_rip_cmd,
ripd: add VRF support * Turn the "instance" YANG presence-container into a YANG list keyed by the new "vrf" leaf. This is a backward incompatible change but this should be ok for now. * RIP VRF instances can be configured even when the corresponding VRF doesn't exist. And a RIP VRF instance isn't deleted when the corresponding VRF is deleted. For this to work, implement the rip_instance_enable() and rip_instance_disable() functions that are called to enable/disable RIP routing instances when necessary. A RIP routing instance can be enabled only when the corresponding VRF is enabled (this information comes from zebra and depends on the underlying VRF backend). Routing instances are stored in the new rip_instances rb-tree (global variable). * Add a vrf pointer to the rip structure instead of storing vrf_id only. This is much more convenient than using vrf_lookup_by_id() every time we need to get the vrf pointer from the VRF ID. The rip->vrf pointer is updated whenever the VRF enable/disable hooks are called. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2019-01-04 22:08:10 +01:00
"no router rip [vrf NAME]",
ripd: retrofit the 'router rip' command to the new northbound model * Implement the northbound callbacks associated to the '/frr-ripd:ripd/instance' YANG path (the code is mostly a copy and paste from the original "router rip" DEFUNs); * Move rip_create_socket() out of rip_create() since creating a socket is an error-prone operation and thus needs to be performed separately during the NB_EV_PREPARE phase; * On rip_create(), fetch the defaults from the frr-ripd YANG model; * Convert the "[no] router rip" CLI commands to be dumb wrappers around the northbound callbacks; * On config_write_rip(), write logic to call all 'cli_show' northbound callbacks defined under the '/frr-ripd:ripd/instance' YANG path. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
NO_STR
"Enable a routing process\n"
ripd: add VRF support * Turn the "instance" YANG presence-container into a YANG list keyed by the new "vrf" leaf. This is a backward incompatible change but this should be ok for now. * RIP VRF instances can be configured even when the corresponding VRF doesn't exist. And a RIP VRF instance isn't deleted when the corresponding VRF is deleted. For this to work, implement the rip_instance_enable() and rip_instance_disable() functions that are called to enable/disable RIP routing instances when necessary. A RIP routing instance can be enabled only when the corresponding VRF is enabled (this information comes from zebra and depends on the underlying VRF backend). Routing instances are stored in the new rip_instances rb-tree (global variable). * Add a vrf pointer to the rip structure instead of storing vrf_id only. This is much more convenient than using vrf_lookup_by_id() every time we need to get the vrf pointer from the VRF ID. The rip->vrf pointer is updated whenever the VRF enable/disable hooks are called. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2019-01-04 22:08:10 +01:00
"Routing Information Protocol (RIP)\n"
VRF_CMD_HELP_STR)
ripd: retrofit the 'router rip' command to the new northbound model * Implement the northbound callbacks associated to the '/frr-ripd:ripd/instance' YANG path (the code is mostly a copy and paste from the original "router rip" DEFUNs); * Move rip_create_socket() out of rip_create() since creating a socket is an error-prone operation and thus needs to be performed separately during the NB_EV_PREPARE phase; * On rip_create(), fetch the defaults from the frr-ripd YANG model; * Convert the "[no] router rip" CLI commands to be dumb wrappers around the northbound callbacks; * On config_write_rip(), write logic to call all 'cli_show' northbound callbacks defined under the '/frr-ripd:ripd/instance' YANG path. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
{
ripd: add VRF support * Turn the "instance" YANG presence-container into a YANG list keyed by the new "vrf" leaf. This is a backward incompatible change but this should be ok for now. * RIP VRF instances can be configured even when the corresponding VRF doesn't exist. And a RIP VRF instance isn't deleted when the corresponding VRF is deleted. For this to work, implement the rip_instance_enable() and rip_instance_disable() functions that are called to enable/disable RIP routing instances when necessary. A RIP routing instance can be enabled only when the corresponding VRF is enabled (this information comes from zebra and depends on the underlying VRF backend). Routing instances are stored in the new rip_instances rb-tree (global variable). * Add a vrf pointer to the rip structure instead of storing vrf_id only. This is much more convenient than using vrf_lookup_by_id() every time we need to get the vrf pointer from the VRF ID. The rip->vrf pointer is updated whenever the VRF enable/disable hooks are called. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2019-01-04 22:08:10 +01:00
char xpath[XPATH_MAXLEN];
/* Build RIP instance XPath. */
if (!vrf)
vrf = VRF_DEFAULT_NAME;
snprintf(xpath, sizeof(xpath), "/frr-ripd:ripd/instance[vrf='%s']",
vrf);
Merge remote-tracking branch 'frr/master' into rip-vrf Merge commit to solve a bunch of conflicts with other PRs that were merged in the previous weeks. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2019-03-02 19:00:46 +01:00
nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
northbound: KISS always batch yang config (file read), it's faster The backoff code assumed that yang operations always completed quickly. It checked for > 100 YANG modeled commands happening in under 1 second to enable batching. If 100 yang modeled commands always take longer than 1 second batching is never enabled. This is the exact opposite of what we want to happen since batching speeds the operations up. Here are the results for libyang2 code without and with batching. | action | 1K rts | 2K rts | 1K rts | 2K rts | 20k rts | | | nobatch | nobatch | batch | batch | batch | | Add IPv4 | .881 | 1.28 | .703 | 1.04 | 8.16 | | Add Same IPv4 | 28.7 | 113 | .590 | .860 | 6.09 | | Rem 1/2 IPv4 | .376 | .442 | .379 | .435 | 1.44 | | Add Same IPv4 | 28.7 | 113 | .576 | .841 | 6.02 | | Rem All IPv4 | 17.4 | 71.8 | .559 | .813 | 5.57 | (IPv6 numbers are basically the same as iPv4, a couple percent slower) Clearly we need this. Please note the growth (1K to 2K) w/o batching is non-linear and 100 times slower than batched. Notes on code: The use of the new `nb_cli_apply_changes_clear_pending` is to commit any pending changes (including the current one). This is done when the code would not correctly handle a single diff that included the current changes with possible following changes. For example, a "no" command followed by a new value to replace it would be merged into a change, and the code would not deal well with that. A good example of this is BGP neighbor peer-group changing. The other use is after entering a router level (e.g., "router bgp") where the follow-on command handlers expect that router object to now exists. The code eventually needs to be cleaned up to not fail in these cases, but that is for future NB cleanup. Signed-off-by: Christian Hopps <chopps@labn.net>
2021-05-28 21:16:18 +02:00
return nb_cli_apply_changes_clear_pending(vty, NULL);
ripd: retrofit the 'router rip' command to the new northbound model * Implement the northbound callbacks associated to the '/frr-ripd:ripd/instance' YANG path (the code is mostly a copy and paste from the original "router rip" DEFUNs); * Move rip_create_socket() out of rip_create() since creating a socket is an error-prone operation and thus needs to be performed separately during the NB_EV_PREPARE phase; * On rip_create(), fetch the defaults from the frr-ripd YANG model; * Convert the "[no] router rip" CLI commands to be dumb wrappers around the northbound callbacks; * On config_write_rip(), write logic to call all 'cli_show' northbound callbacks defined under the '/frr-ripd:ripd/instance' YANG path. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
}
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
void cli_show_router_rip(struct vty *vty, const struct lyd_node *dnode,
ripd: retrofit the 'router rip' command to the new northbound model * Implement the northbound callbacks associated to the '/frr-ripd:ripd/instance' YANG path (the code is mostly a copy and paste from the original "router rip" DEFUNs); * Move rip_create_socket() out of rip_create() since creating a socket is an error-prone operation and thus needs to be performed separately during the NB_EV_PREPARE phase; * On rip_create(), fetch the defaults from the frr-ripd YANG model; * Convert the "[no] router rip" CLI commands to be dumb wrappers around the northbound callbacks; * On config_write_rip(), write logic to call all 'cli_show' northbound callbacks defined under the '/frr-ripd:ripd/instance' YANG path. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
bool show_defaults)
{
ripd: add VRF support * Turn the "instance" YANG presence-container into a YANG list keyed by the new "vrf" leaf. This is a backward incompatible change but this should be ok for now. * RIP VRF instances can be configured even when the corresponding VRF doesn't exist. And a RIP VRF instance isn't deleted when the corresponding VRF is deleted. For this to work, implement the rip_instance_enable() and rip_instance_disable() functions that are called to enable/disable RIP routing instances when necessary. A RIP routing instance can be enabled only when the corresponding VRF is enabled (this information comes from zebra and depends on the underlying VRF backend). Routing instances are stored in the new rip_instances rb-tree (global variable). * Add a vrf pointer to the rip structure instead of storing vrf_id only. This is much more convenient than using vrf_lookup_by_id() every time we need to get the vrf pointer from the VRF ID. The rip->vrf pointer is updated whenever the VRF enable/disable hooks are called. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2019-01-04 22:08:10 +01:00
const char *vrf_name;
vrf_name = yang_dnode_get_string(dnode, "./vrf");
ripd: retrofit the 'router rip' command to the new northbound model * Implement the northbound callbacks associated to the '/frr-ripd:ripd/instance' YANG path (the code is mostly a copy and paste from the original "router rip" DEFUNs); * Move rip_create_socket() out of rip_create() since creating a socket is an error-prone operation and thus needs to be performed separately during the NB_EV_PREPARE phase; * On rip_create(), fetch the defaults from the frr-ripd YANG model; * Convert the "[no] router rip" CLI commands to be dumb wrappers around the northbound callbacks; * On config_write_rip(), write logic to call all 'cli_show' northbound callbacks defined under the '/frr-ripd:ripd/instance' YANG path. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
vty_out(vty, "!\n");
ripd: add VRF support * Turn the "instance" YANG presence-container into a YANG list keyed by the new "vrf" leaf. This is a backward incompatible change but this should be ok for now. * RIP VRF instances can be configured even when the corresponding VRF doesn't exist. And a RIP VRF instance isn't deleted when the corresponding VRF is deleted. For this to work, implement the rip_instance_enable() and rip_instance_disable() functions that are called to enable/disable RIP routing instances when necessary. A RIP routing instance can be enabled only when the corresponding VRF is enabled (this information comes from zebra and depends on the underlying VRF backend). Routing instances are stored in the new rip_instances rb-tree (global variable). * Add a vrf pointer to the rip structure instead of storing vrf_id only. This is much more convenient than using vrf_lookup_by_id() every time we need to get the vrf pointer from the VRF ID. The rip->vrf pointer is updated whenever the VRF enable/disable hooks are called. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2019-01-04 22:08:10 +01:00
vty_out(vty, "router rip");
if (!strmatch(vrf_name, VRF_DEFAULT_NAME))
vty_out(vty, " vrf %s", vrf_name);
vty_out(vty, "\n");
ripd: retrofit the 'router rip' command to the new northbound model * Implement the northbound callbacks associated to the '/frr-ripd:ripd/instance' YANG path (the code is mostly a copy and paste from the original "router rip" DEFUNs); * Move rip_create_socket() out of rip_create() since creating a socket is an error-prone operation and thus needs to be performed separately during the NB_EV_PREPARE phase; * On rip_create(), fetch the defaults from the frr-ripd YANG model; * Convert the "[no] router rip" CLI commands to be dumb wrappers around the northbound callbacks; * On config_write_rip(), write logic to call all 'cli_show' northbound callbacks defined under the '/frr-ripd:ripd/instance' YANG path. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
}
ripd: retrofit the 'allow-ecmp' command to the new northbound model Trivial conversion. The rip->ecmp variable was converted to a boolean to match the way it's defined in the YANG module. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
/*
* XPath: /frr-ripd:ripd/instance/allow-ecmp
*/
ripd: Implement `allow-ecmp X` command Allow setting an arbitrary number of paths to be installed instead of ALL. Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2023-05-04 08:13:07 +02:00
DEFUN_YANG (rip_allow_ecmp,
ripd: retrofit the 'allow-ecmp' command to the new northbound model Trivial conversion. The rip->ecmp variable was converted to a boolean to match the way it's defined in the YANG module. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
rip_allow_ecmp_cmd,
ripd: Implement `allow-ecmp X` command Allow setting an arbitrary number of paths to be installed instead of ALL. Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2023-05-04 08:13:07 +02:00
"allow-ecmp [" CMD_RANGE_STR(1, MULTIPATH_NUM) "]",
"Allow Equal Cost MultiPath\n"
"Number of paths\n")
{
int idx_number = 1;
char mpaths[3] = {};
uint32_t paths = MULTIPATH_NUM;
if (argv[idx_number])
paths = strtol(argv[idx_number]->arg, NULL, 10);
snprintf(mpaths, sizeof(mpaths), "%u", paths);
nb_cli_enqueue_change(vty, "./allow-ecmp", NB_OP_MODIFY, mpaths);
return nb_cli_apply_changes(vty, NULL);
}
DEFUN_YANG (no_rip_allow_ecmp,
no_rip_allow_ecmp_cmd,
"no allow-ecmp [" CMD_RANGE_STR(1, MULTIPATH_NUM) "]",
ripd: retrofit the 'allow-ecmp' command to the new northbound model Trivial conversion. The rip->ecmp variable was converted to a boolean to match the way it's defined in the YANG module. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
NO_STR
ripd: Implement `allow-ecmp X` command Allow setting an arbitrary number of paths to be installed instead of ALL. Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2023-05-04 08:13:07 +02:00
"Allow Equal Cost MultiPath\n"
"Number of paths\n")
ripd: retrofit the 'allow-ecmp' command to the new northbound model Trivial conversion. The rip->ecmp variable was converted to a boolean to match the way it's defined in the YANG module. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
{
ripd: Implement `allow-ecmp X` command Allow setting an arbitrary number of paths to be installed instead of ALL. Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2023-05-04 08:13:07 +02:00
nb_cli_enqueue_change(vty, "./allow-ecmp", NB_OP_MODIFY, 0);
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
return nb_cli_apply_changes(vty, NULL);
ripd: retrofit the 'allow-ecmp' command to the new northbound model Trivial conversion. The rip->ecmp variable was converted to a boolean to match the way it's defined in the YANG module. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
}
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
void cli_show_rip_allow_ecmp(struct vty *vty, const struct lyd_node *dnode,
ripd: retrofit the 'allow-ecmp' command to the new northbound model Trivial conversion. The rip->ecmp variable was converted to a boolean to match the way it's defined in the YANG module. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
bool show_defaults)
{
ripd: Implement `allow-ecmp X` command Allow setting an arbitrary number of paths to be installed instead of ALL. Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2023-05-04 08:13:07 +02:00
uint8_t paths;
paths = yang_dnode_get_uint8(dnode, NULL);
ripd: retrofit the 'allow-ecmp' command to the new northbound model Trivial conversion. The rip->ecmp variable was converted to a boolean to match the way it's defined in the YANG module. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
ripd: Implement `allow-ecmp X` command Allow setting an arbitrary number of paths to be installed instead of ALL. Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2023-05-04 08:13:07 +02:00
if (!paths)
vty_out(vty, " no allow-ecmp\n");
else
vty_out(vty, " allow-ecmp %d\n", paths);
ripd: retrofit the 'allow-ecmp' command to the new northbound model Trivial conversion. The rip->ecmp variable was converted to a boolean to match the way it's defined in the YANG module. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
}
ripd: retrofit the 'default-information' command to the new northbound model Trivial conversion. 'rip->default_information_route_map' was removed since it wasn't being used anywhere. 'rip->default_information' was removed too because it was being used only to display the running configuration and thus is not necessary anymore. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
/*
* XPath: /frr-ripd:ripd/instance/default-information-originate
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (rip_default_information_originate,
ripd: retrofit the 'default-information' command to the new northbound model Trivial conversion. 'rip->default_information_route_map' was removed since it wasn't being used anywhere. 'rip->default_information' was removed too because it was being used only to display the running configuration and thus is not necessary anymore. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
rip_default_information_originate_cmd,
"[no] default-information originate",
NO_STR
"Control distribution of default route\n"
"Distribute a default route\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
nb_cli_enqueue_change(vty, "./default-information-originate",
NB_OP_MODIFY, no ? "false" : "true");
return nb_cli_apply_changes(vty, NULL);
ripd: retrofit the 'default-information' command to the new northbound model Trivial conversion. 'rip->default_information_route_map' was removed since it wasn't being used anywhere. 'rip->default_information' was removed too because it was being used only to display the running configuration and thus is not necessary anymore. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
}
void cli_show_rip_default_information_originate(struct vty *vty,
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
const struct lyd_node *dnode,
ripd: retrofit the 'default-information' command to the new northbound model Trivial conversion. 'rip->default_information_route_map' was removed since it wasn't being used anywhere. 'rip->default_information' was removed too because it was being used only to display the running configuration and thus is not necessary anymore. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
bool show_defaults)
{
if (!yang_dnode_get_bool(dnode, NULL))
vty_out(vty, " no");
vty_out(vty, " default-information originate\n");
}
ripd: retrofit the 'default-metric' command to the new northbound model Trivial conversion. rip->default_metric was converted to an uint8_t to match the way it's defined in the YANG module. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
/*
* XPath: /frr-ripd:ripd/instance/default-metric
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (rip_default_metric,
ripd: retrofit the 'default-metric' command to the new northbound model Trivial conversion. rip->default_metric was converted to an uint8_t to match the way it's defined in the YANG module. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
rip_default_metric_cmd,
"default-metric (1-16)",
"Set a metric of redistribute routes\n"
"Default metric\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
nb_cli_enqueue_change(vty, "./default-metric", NB_OP_MODIFY,
default_metric_str);
return nb_cli_apply_changes(vty, NULL);
ripd: retrofit the 'default-metric' command to the new northbound model Trivial conversion. rip->default_metric was converted to an uint8_t to match the way it's defined in the YANG module. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
}
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (no_rip_default_metric,
ripd: retrofit the 'default-metric' command to the new northbound model Trivial conversion. rip->default_metric was converted to an uint8_t to match the way it's defined in the YANG module. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
no_rip_default_metric_cmd,
"no default-metric [(1-16)]",
NO_STR
"Set a metric of redistribute routes\n"
"Default metric\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
nb_cli_enqueue_change(vty, "./default-metric", NB_OP_MODIFY, NULL);
return nb_cli_apply_changes(vty, NULL);
ripd: retrofit the 'default-metric' command to the new northbound model Trivial conversion. rip->default_metric was converted to an uint8_t to match the way it's defined in the YANG module. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
}
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
void cli_show_rip_default_metric(struct vty *vty, const struct lyd_node *dnode,
ripd: retrofit the 'default-metric' command to the new northbound model Trivial conversion. rip->default_metric was converted to an uint8_t to match the way it's defined in the YANG module. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
bool show_defaults)
{
vty_out(vty, " default-metric %s\n",
yang_dnode_get_string(dnode, NULL));
}
ripd: retrofit the 'distance' command to the new northbound model Trivial conversion. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
/*
* XPath: /frr-ripd:ripd/instance/distance/default
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (rip_distance,
ripd: retrofit the 'distance' command to the new northbound model Trivial conversion. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
rip_distance_cmd,
"distance (1-255)",
"Administrative distance\n"
"Distance value\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
nb_cli_enqueue_change(vty, "./distance/default", NB_OP_MODIFY,
distance_str);
return nb_cli_apply_changes(vty, NULL);
ripd: retrofit the 'distance' command to the new northbound model Trivial conversion. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
}
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (no_rip_distance,
ripd: retrofit the 'distance' command to the new northbound model Trivial conversion. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
no_rip_distance_cmd,
"no distance [(1-255)]",
NO_STR
"Administrative distance\n"
"Distance value\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
nb_cli_enqueue_change(vty, "./distance/default", NB_OP_MODIFY, NULL);
return nb_cli_apply_changes(vty, NULL);
ripd: retrofit the 'distance' command to the new northbound model Trivial conversion. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
}
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
void cli_show_rip_distance(struct vty *vty, const struct lyd_node *dnode,
ripd: retrofit the 'distance' command to the new northbound model Trivial conversion. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
bool show_defaults)
{
ripd: fix display of the "distance" command When displaying a configuration using the "with-defaults" option, do not display "distance 0" when the "distance" command is not configured. The range of accepted values is (1-255), so "distance 0" isn't a valid command. In this case, display "no distance". Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-25 00:55:25 +01:00
if (yang_dnode_is_default(dnode, NULL))
vty_out(vty, " no distance\n");
else
vty_out(vty, " distance %s\n",
yang_dnode_get_string(dnode, NULL));
ripd: retrofit the 'distance' command to the new northbound model Trivial conversion. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
}
ripd: retrofit the 'distance source' commands to the new northbound model The "distance (1-255) A.B.C.D/M [WORD]" command was modeled using a YANG list, which makes it a little bit more complicated to convert to the new northbound model. The rip_distance_set() and rip_distance_unset() functions were removed since they set/unset multiple configuration options at the same time. The northbound callbacks need to set/unset configuration options individually. When a distance list is created, use yang_dnode_set_entry() to store a pointer in the configuration node, and retrieve this pointer in the other callbacks using yang_dnode_get_entry(). The 'rip_distance' structure was moved to ripd.h so that it can be used in the rip_northbound.c file. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
/*
* XPath: /frr-ripd:ripd/instance/distance/source
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (rip_distance_source,
ripd: retrofit the 'distance source' commands to the new northbound model The "distance (1-255) A.B.C.D/M [WORD]" command was modeled using a YANG list, which makes it a little bit more complicated to convert to the new northbound model. The rip_distance_set() and rip_distance_unset() functions were removed since they set/unset multiple configuration options at the same time. The northbound callbacks need to set/unset configuration options individually. When a distance list is created, use yang_dnode_set_entry() to store a pointer in the configuration node, and retrieve this pointer in the other callbacks using yang_dnode_get_entry(). The 'rip_distance' structure was moved to ripd.h so that it can be used in the rip_northbound.c file. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
rip_distance_source_cmd,
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
"[no] distance (1-255) A.B.C.D/M$prefix [WORD$acl]",
ripd: retrofit the 'distance source' commands to the new northbound model The "distance (1-255) A.B.C.D/M [WORD]" command was modeled using a YANG list, which makes it a little bit more complicated to convert to the new northbound model. The rip_distance_set() and rip_distance_unset() functions were removed since they set/unset multiple configuration options at the same time. The northbound callbacks need to set/unset configuration options individually. When a distance list is created, use yang_dnode_set_entry() to store a pointer in the configuration node, and retrieve this pointer in the other callbacks using yang_dnode_get_entry(). The 'rip_distance' structure was moved to ripd.h so that it can be used in the rip_northbound.c file. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
NO_STR
"Administrative distance\n"
"Distance value\n"
"IP source prefix\n"
"Access list name\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
if (!no) {
nb_cli_enqueue_change(vty, ".", NB_OP_CREATE, NULL);
ripd: fix minor issues from the northbound conversion * Always apply the mask of IPv4 prefixes (user data) in the northbound callbacks, we shouldn't assume the northbound plugins will do that for us. * Fix a bug in the "distance" command introduced by commit a6233bfcb3b. * Remove unnecessary check in the ripd_instance_redistribute_route_map_delete() function and reset the route-map's map pointer for safety as well. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-29 20:06:22 +01:00
nb_cli_enqueue_change(vty, "./distance", NB_OP_MODIFY,
distance_str);
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
nb_cli_enqueue_change(vty, "./access-list",
libs, rip, isis: change northbound operation enum to DESTROY Change the northbound lib operation from DELETE to DESTROY; make the required changes in the users of the northbound, in the cli, rip, ripng, and isis. Signed-off-by: Mark Stapp <mjs@voltanet.io>
2019-01-30 10:54:25 +01:00
acl ? NB_OP_MODIFY : NB_OP_DESTROY, acl);
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
} else
libs, rip, isis: change northbound operation enum to DESTROY Change the northbound lib operation from DELETE to DESTROY; make the required changes in the users of the northbound, in the cli, rip, ripng, and isis. Signed-off-by: Mark Stapp <mjs@voltanet.io>
2019-01-30 10:54:25 +01:00
nb_cli_enqueue_change(vty, ".", NB_OP_DESTROY, NULL);
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
return nb_cli_apply_changes(vty, "./distance/source[prefix='%s']",
prefix_str);
ripd: retrofit the 'distance source' commands to the new northbound model The "distance (1-255) A.B.C.D/M [WORD]" command was modeled using a YANG list, which makes it a little bit more complicated to convert to the new northbound model. The rip_distance_set() and rip_distance_unset() functions were removed since they set/unset multiple configuration options at the same time. The northbound callbacks need to set/unset configuration options individually. When a distance list is created, use yang_dnode_set_entry() to store a pointer in the configuration node, and retrieve this pointer in the other callbacks using yang_dnode_get_entry(). The 'rip_distance' structure was moved to ripd.h so that it can be used in the rip_northbound.c file. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
}
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
void cli_show_rip_distance_source(struct vty *vty, const struct lyd_node *dnode,
ripd: retrofit the 'distance source' commands to the new northbound model The "distance (1-255) A.B.C.D/M [WORD]" command was modeled using a YANG list, which makes it a little bit more complicated to convert to the new northbound model. The rip_distance_set() and rip_distance_unset() functions were removed since they set/unset multiple configuration options at the same time. The northbound callbacks need to set/unset configuration options individually. When a distance list is created, use yang_dnode_set_entry() to store a pointer in the configuration node, and retrieve this pointer in the other callbacks using yang_dnode_get_entry(). The 'rip_distance' structure was moved to ripd.h so that it can be used in the rip_northbound.c file. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
bool show_defaults)
{
vty_out(vty, " distance %s %s",
yang_dnode_get_string(dnode, "./distance"),
yang_dnode_get_string(dnode, "./prefix"));
if (yang_dnode_exists(dnode, "./access-list"))
vty_out(vty, " %s",
yang_dnode_get_string(dnode, "./access-list"));
vty_out(vty, "\n");
}
ripd: retrofit the 'neighbor' command to the new northbound model Make rip_neighbor_add() and rip_neighbor_delete() return northbound error codes since their return values are used as the return value of some northbound callbacks. These functions shouldn't fail in normal conditions because the northbound layer guarantees it will never call the 'create' or 'delete' callback more than once for the same object. Hence any failure in those functions would indicate an internal inconsistency that needs to be investigated (by returning NB_ERR the northbound will log a detailed error message indicating the xpath of the object, the event and the callback where the error happened). Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
/*
* XPath: /frr-ripd:ripd/instance/explicit-neighbor
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (rip_neighbor,
ripd: retrofit the 'neighbor' command to the new northbound model Make rip_neighbor_add() and rip_neighbor_delete() return northbound error codes since their return values are used as the return value of some northbound callbacks. These functions shouldn't fail in normal conditions because the northbound layer guarantees it will never call the 'create' or 'delete' callback more than once for the same object. Hence any failure in those functions would indicate an internal inconsistency that needs to be investigated (by returning NB_ERR the northbound will log a detailed error message indicating the xpath of the object, the event and the callback where the error happened). Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
rip_neighbor_cmd,
"[no] neighbor A.B.C.D",
NO_STR
"Specify a neighbor router\n"
"Neighbor address\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
nb_cli_enqueue_change(vty, "./explicit-neighbor",
libs, rip, isis: change northbound operation enum to DESTROY Change the northbound lib operation from DELETE to DESTROY; make the required changes in the users of the northbound, in the cli, rip, ripng, and isis. Signed-off-by: Mark Stapp <mjs@voltanet.io>
2019-01-30 10:54:25 +01:00
no ? NB_OP_DESTROY : NB_OP_CREATE, neighbor_str);
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
return nb_cli_apply_changes(vty, NULL);
ripd: retrofit the 'neighbor' command to the new northbound model Make rip_neighbor_add() and rip_neighbor_delete() return northbound error codes since their return values are used as the return value of some northbound callbacks. These functions shouldn't fail in normal conditions because the northbound layer guarantees it will never call the 'create' or 'delete' callback more than once for the same object. Hence any failure in those functions would indicate an internal inconsistency that needs to be investigated (by returning NB_ERR the northbound will log a detailed error message indicating the xpath of the object, the event and the callback where the error happened). Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
}
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
void cli_show_rip_neighbor(struct vty *vty, const struct lyd_node *dnode,
ripd: retrofit the 'neighbor' command to the new northbound model Make rip_neighbor_add() and rip_neighbor_delete() return northbound error codes since their return values are used as the return value of some northbound callbacks. These functions shouldn't fail in normal conditions because the northbound layer guarantees it will never call the 'create' or 'delete' callback more than once for the same object. Hence any failure in those functions would indicate an internal inconsistency that needs to be investigated (by returning NB_ERR the northbound will log a detailed error message indicating the xpath of the object, the event and the callback where the error happened). Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
bool show_defaults)
{
vty_out(vty, " neighbor %s\n", yang_dnode_get_string(dnode, NULL));
}
ripd: retrofit the 'network' command to the new northbound model The frr-ripd YANG module models the ripd "network" command using two separate leaf-lists for simplicity: one leaf-list for interfaces and another leaf-list for actual networks. In the 'cli_show' callbacks, display the "network" command for entries of both leaf-lists. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
/*
* XPath: /frr-ripd:ripd/instance/network
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (rip_network_prefix,
ripd: retrofit the 'network' command to the new northbound model The frr-ripd YANG module models the ripd "network" command using two separate leaf-lists for simplicity: one leaf-list for interfaces and another leaf-list for actual networks. In the 'cli_show' callbacks, display the "network" command for entries of both leaf-lists. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
rip_network_prefix_cmd,
"[no] network A.B.C.D/M",
NO_STR
"Enable routing on an IP network\n"
"IP prefix <network>/<length>, e.g., 35.0.0.0/8\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
nb_cli_enqueue_change(vty, "./network",
libs, rip, isis: change northbound operation enum to DESTROY Change the northbound lib operation from DELETE to DESTROY; make the required changes in the users of the northbound, in the cli, rip, ripng, and isis. Signed-off-by: Mark Stapp <mjs@voltanet.io>
2019-01-30 10:54:25 +01:00
no ? NB_OP_DESTROY : NB_OP_CREATE, network_str);
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
return nb_cli_apply_changes(vty, NULL);
ripd: retrofit the 'network' command to the new northbound model The frr-ripd YANG module models the ripd "network" command using two separate leaf-lists for simplicity: one leaf-list for interfaces and another leaf-list for actual networks. In the 'cli_show' callbacks, display the "network" command for entries of both leaf-lists. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
}
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
void cli_show_rip_network_prefix(struct vty *vty, const struct lyd_node *dnode,
ripd: retrofit the 'network' command to the new northbound model The frr-ripd YANG module models the ripd "network" command using two separate leaf-lists for simplicity: one leaf-list for interfaces and another leaf-list for actual networks. In the 'cli_show' callbacks, display the "network" command for entries of both leaf-lists. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
bool show_defaults)
{
vty_out(vty, " network %s\n", yang_dnode_get_string(dnode, NULL));
}
/*
* XPath: /frr-ripd:ripd/instance/interface
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (rip_network_if,
ripd: retrofit the 'network' command to the new northbound model The frr-ripd YANG module models the ripd "network" command using two separate leaf-lists for simplicity: one leaf-list for interfaces and another leaf-list for actual networks. In the 'cli_show' callbacks, display the "network" command for entries of both leaf-lists. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
rip_network_if_cmd,
"[no] network WORD",
NO_STR
"Enable routing on an IP network\n"
"Interface name\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
nb_cli_enqueue_change(vty, "./interface",
libs, rip, isis: change northbound operation enum to DESTROY Change the northbound lib operation from DELETE to DESTROY; make the required changes in the users of the northbound, in the cli, rip, ripng, and isis. Signed-off-by: Mark Stapp <mjs@voltanet.io>
2019-01-30 10:54:25 +01:00
no ? NB_OP_DESTROY : NB_OP_CREATE, network);
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
return nb_cli_apply_changes(vty, NULL);
ripd: retrofit the 'network' command to the new northbound model The frr-ripd YANG module models the ripd "network" command using two separate leaf-lists for simplicity: one leaf-list for interfaces and another leaf-list for actual networks. In the 'cli_show' callbacks, display the "network" command for entries of both leaf-lists. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
}
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
void cli_show_rip_network_interface(struct vty *vty,
const struct lyd_node *dnode,
ripd: retrofit the 'network' command to the new northbound model The frr-ripd YANG module models the ripd "network" command using two separate leaf-lists for simplicity: one leaf-list for interfaces and another leaf-list for actual networks. In the 'cli_show' callbacks, display the "network" command for entries of both leaf-lists. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
bool show_defaults)
{
vty_out(vty, " network %s\n", yang_dnode_get_string(dnode, NULL));
}
ripd: retrofit the 'offset-list' command to the new northbound model Remove the rip_offset_list_set() and rip_offset_list_unset() functions since they set/unset multiple configuration options at the same time. The northbound callbacks need to set/unset configuration options individually. The frr-ripd YANG module models the "offset-list" command using a list keyed by the 'interface' and 'direction' leafs. One important detail is that the IFNAME parameter is optional, and when it's not present it means we want to match all interfaces. This is modeled using an interface name of '*' since key lists are mandatory by definition in YANG. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
/*
* XPath: /frr-ripd:ripd/instance/offset-list
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (rip_offset_list,
ripd: retrofit the 'offset-list' command to the new northbound model Remove the rip_offset_list_set() and rip_offset_list_unset() functions since they set/unset multiple configuration options at the same time. The northbound callbacks need to set/unset configuration options individually. The frr-ripd YANG module models the "offset-list" command using a list keyed by the 'interface' and 'direction' leafs. One important detail is that the IFNAME parameter is optional, and when it's not present it means we want to match all interfaces. This is modeled using an interface name of '*' since key lists are mandatory by definition in YANG. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
rip_offset_list_cmd,
lib: Add autocomplete for access-lists Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
2021-10-21 21:52:14 +02:00
"[no] offset-list ACCESSLIST4_NAME$acl <in|out>$direction (0-16)$metric [IFNAME]",
ripd: retrofit the 'offset-list' command to the new northbound model Remove the rip_offset_list_set() and rip_offset_list_unset() functions since they set/unset multiple configuration options at the same time. The northbound callbacks need to set/unset configuration options individually. The frr-ripd YANG module models the "offset-list" command using a list keyed by the 'interface' and 'direction' leafs. One important detail is that the IFNAME parameter is optional, and when it's not present it means we want to match all interfaces. This is modeled using an interface name of '*' since key lists are mandatory by definition in YANG. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
NO_STR
"Modify RIP metric\n"
"Access-list name\n"
"For incoming updates\n"
"For outgoing updates\n"
"Metric value\n"
"Interface to match\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
if (!no) {
nb_cli_enqueue_change(vty, ".", NB_OP_CREATE, NULL);
nb_cli_enqueue_change(vty, "./access-list", NB_OP_MODIFY, acl);
nb_cli_enqueue_change(vty, "./metric", NB_OP_MODIFY,
metric_str);
} else
libs, rip, isis: change northbound operation enum to DESTROY Change the northbound lib operation from DELETE to DESTROY; make the required changes in the users of the northbound, in the cli, rip, ripng, and isis. Signed-off-by: Mark Stapp <mjs@voltanet.io>
2019-01-30 10:54:25 +01:00
nb_cli_enqueue_change(vty, ".", NB_OP_DESTROY, NULL);
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
return nb_cli_apply_changes(
vty, "./offset-list[interface='%s'][direction='%s']",
ifname ? ifname : "*", direction);
ripd: retrofit the 'offset-list' command to the new northbound model Remove the rip_offset_list_set() and rip_offset_list_unset() functions since they set/unset multiple configuration options at the same time. The northbound callbacks need to set/unset configuration options individually. The frr-ripd YANG module models the "offset-list" command using a list keyed by the 'interface' and 'direction' leafs. One important detail is that the IFNAME parameter is optional, and when it's not present it means we want to match all interfaces. This is modeled using an interface name of '*' since key lists are mandatory by definition in YANG. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
}
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
void cli_show_rip_offset_list(struct vty *vty, const struct lyd_node *dnode,
ripd: retrofit the 'offset-list' command to the new northbound model Remove the rip_offset_list_set() and rip_offset_list_unset() functions since they set/unset multiple configuration options at the same time. The northbound callbacks need to set/unset configuration options individually. The frr-ripd YANG module models the "offset-list" command using a list keyed by the 'interface' and 'direction' leafs. One important detail is that the IFNAME parameter is optional, and when it's not present it means we want to match all interfaces. This is modeled using an interface name of '*' since key lists are mandatory by definition in YANG. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
bool show_defaults)
{
const char *interface;
interface = yang_dnode_get_string(dnode, "./interface");
vty_out(vty, " offset-list %s %s %s",
yang_dnode_get_string(dnode, "./access-list"),
yang_dnode_get_string(dnode, "./direction"),
yang_dnode_get_string(dnode, "./metric"));
if (!strmatch(interface, "*"))
vty_out(vty, " %s", interface);
vty_out(vty, "\n");
}
ripd: retrofit the 'passive-interface' command to the new northbound model In ripd, the "passive-interface default" command has the following behavior: * All interfaces are converted to the passive mode; * The "passive-interface IFNAME" command becomes a no-operation and "passive-interface IFNAME" statements are removed from the running configuration. * The "no passive-interface IFNAME" can be used to remove interfaces from the passive mode. This command was modeled using the following YANG data nodes in the frr-ripd module: leaf passive-default { type boolean; default "false"; description "Control whether interfaces are in the passive mode by default or not."; } leaf-list passive-interface { when "../passive-default = 'false'"; type string { length "1..16"; } description "A list of interfaces where the sending of RIP packets is disabled."; } leaf-list non-passive-interface { when "../passive-default = 'true'"; type string { length "1..16"; } description "A list of interfaces where the sending of RIP packets is enabled."; } The 'when' statements guarantee that the list of passive interfaces is cleared when the "passive-interface default" command is entered (likewise, they guarantee that the list of non-passive interfaces is cleared when the "passive-interface default" command is removed). This matches exactly the behavior we want to model. Finally, move the 'passive_default' global variable into the 'rip' structure where it belongs. This fixed the bug where the "passive-interface default" command was being retained after a "no router rip" + "router rip". Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
/*
* XPath: /frr-ripd:ripd/instance/passive-default
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (rip_passive_default,
ripd: retrofit the 'passive-interface' command to the new northbound model In ripd, the "passive-interface default" command has the following behavior: * All interfaces are converted to the passive mode; * The "passive-interface IFNAME" command becomes a no-operation and "passive-interface IFNAME" statements are removed from the running configuration. * The "no passive-interface IFNAME" can be used to remove interfaces from the passive mode. This command was modeled using the following YANG data nodes in the frr-ripd module: leaf passive-default { type boolean; default "false"; description "Control whether interfaces are in the passive mode by default or not."; } leaf-list passive-interface { when "../passive-default = 'false'"; type string { length "1..16"; } description "A list of interfaces where the sending of RIP packets is disabled."; } leaf-list non-passive-interface { when "../passive-default = 'true'"; type string { length "1..16"; } description "A list of interfaces where the sending of RIP packets is enabled."; } The 'when' statements guarantee that the list of passive interfaces is cleared when the "passive-interface default" command is entered (likewise, they guarantee that the list of non-passive interfaces is cleared when the "passive-interface default" command is removed). This matches exactly the behavior we want to model. Finally, move the 'passive_default' global variable into the 'rip' structure where it belongs. This fixed the bug where the "passive-interface default" command was being retained after a "no router rip" + "router rip". Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
rip_passive_default_cmd,
"[no] passive-interface default",
NO_STR
"Suppress routing updates on an interface\n"
"default for all interfaces\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
nb_cli_enqueue_change(vty, "./passive-default", NB_OP_MODIFY,
no ? "false" : "true");
return nb_cli_apply_changes(vty, NULL);
ripd: retrofit the 'passive-interface' command to the new northbound model In ripd, the "passive-interface default" command has the following behavior: * All interfaces are converted to the passive mode; * The "passive-interface IFNAME" command becomes a no-operation and "passive-interface IFNAME" statements are removed from the running configuration. * The "no passive-interface IFNAME" can be used to remove interfaces from the passive mode. This command was modeled using the following YANG data nodes in the frr-ripd module: leaf passive-default { type boolean; default "false"; description "Control whether interfaces are in the passive mode by default or not."; } leaf-list passive-interface { when "../passive-default = 'false'"; type string { length "1..16"; } description "A list of interfaces where the sending of RIP packets is disabled."; } leaf-list non-passive-interface { when "../passive-default = 'true'"; type string { length "1..16"; } description "A list of interfaces where the sending of RIP packets is enabled."; } The 'when' statements guarantee that the list of passive interfaces is cleared when the "passive-interface default" command is entered (likewise, they guarantee that the list of non-passive interfaces is cleared when the "passive-interface default" command is removed). This matches exactly the behavior we want to model. Finally, move the 'passive_default' global variable into the 'rip' structure where it belongs. This fixed the bug where the "passive-interface default" command was being retained after a "no router rip" + "router rip". Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
}
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
void cli_show_rip_passive_default(struct vty *vty, const struct lyd_node *dnode,
ripd: retrofit the 'passive-interface' command to the new northbound model In ripd, the "passive-interface default" command has the following behavior: * All interfaces are converted to the passive mode; * The "passive-interface IFNAME" command becomes a no-operation and "passive-interface IFNAME" statements are removed from the running configuration. * The "no passive-interface IFNAME" can be used to remove interfaces from the passive mode. This command was modeled using the following YANG data nodes in the frr-ripd module: leaf passive-default { type boolean; default "false"; description "Control whether interfaces are in the passive mode by default or not."; } leaf-list passive-interface { when "../passive-default = 'false'"; type string { length "1..16"; } description "A list of interfaces where the sending of RIP packets is disabled."; } leaf-list non-passive-interface { when "../passive-default = 'true'"; type string { length "1..16"; } description "A list of interfaces where the sending of RIP packets is enabled."; } The 'when' statements guarantee that the list of passive interfaces is cleared when the "passive-interface default" command is entered (likewise, they guarantee that the list of non-passive interfaces is cleared when the "passive-interface default" command is removed). This matches exactly the behavior we want to model. Finally, move the 'passive_default' global variable into the 'rip' structure where it belongs. This fixed the bug where the "passive-interface default" command was being retained after a "no router rip" + "router rip". Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
bool show_defaults)
{
if (!yang_dnode_get_bool(dnode, NULL))
vty_out(vty, " no");
vty_out(vty, " passive-interface default\n");
}
/*
* XPath: /frr-ripd:ripd/instance/passive-interface
* /frr-ripd:ripd/instance/non-passive-interface
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (rip_passive_interface,
ripd: retrofit the 'passive-interface' command to the new northbound model In ripd, the "passive-interface default" command has the following behavior: * All interfaces are converted to the passive mode; * The "passive-interface IFNAME" command becomes a no-operation and "passive-interface IFNAME" statements are removed from the running configuration. * The "no passive-interface IFNAME" can be used to remove interfaces from the passive mode. This command was modeled using the following YANG data nodes in the frr-ripd module: leaf passive-default { type boolean; default "false"; description "Control whether interfaces are in the passive mode by default or not."; } leaf-list passive-interface { when "../passive-default = 'false'"; type string { length "1..16"; } description "A list of interfaces where the sending of RIP packets is disabled."; } leaf-list non-passive-interface { when "../passive-default = 'true'"; type string { length "1..16"; } description "A list of interfaces where the sending of RIP packets is enabled."; } The 'when' statements guarantee that the list of passive interfaces is cleared when the "passive-interface default" command is entered (likewise, they guarantee that the list of non-passive interfaces is cleared when the "passive-interface default" command is removed). This matches exactly the behavior we want to model. Finally, move the 'passive_default' global variable into the 'rip' structure where it belongs. This fixed the bug where the "passive-interface default" command was being retained after a "no router rip" + "router rip". Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
rip_passive_interface_cmd,
"[no] passive-interface IFNAME",
NO_STR
"Suppress routing updates on an interface\n"
"Interface name\n")
{
ripd: fix removal of configured passive interfaces libyang-0.16-rc3 fixed a bug [1] in which data would be auto-deleted when it shouldn't. The problem is that the "no passive-interface" command was relying on that wrong behavior, so the command was affected when the libyang bug was fixed. Adapt the command to do the right thing in order to get rid of the problem (regardless of the libyang version being used). "passive-interface default" still has problems though, but that will be addressed separetely in the future. Fixes #3870. [1] https://github.com/CESNET/libyang/commit/8af82206908 Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2019-03-02 21:45:14 +01:00
bool passive_default =
yang_dnode_get_bool(vty->candidate_config->dnode, "%s%s",
VTY_CURR_XPATH, "/passive-default");
if (passive_default) {
nb_cli_enqueue_change(vty, "./non-passive-interface",
no ? NB_OP_CREATE : NB_OP_DESTROY,
ifname);
} else {
nb_cli_enqueue_change(vty, "./passive-interface",
no ? NB_OP_DESTROY : NB_OP_CREATE,
ifname);
}
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
return nb_cli_apply_changes(vty, NULL);
ripd: retrofit the 'passive-interface' command to the new northbound model In ripd, the "passive-interface default" command has the following behavior: * All interfaces are converted to the passive mode; * The "passive-interface IFNAME" command becomes a no-operation and "passive-interface IFNAME" statements are removed from the running configuration. * The "no passive-interface IFNAME" can be used to remove interfaces from the passive mode. This command was modeled using the following YANG data nodes in the frr-ripd module: leaf passive-default { type boolean; default "false"; description "Control whether interfaces are in the passive mode by default or not."; } leaf-list passive-interface { when "../passive-default = 'false'"; type string { length "1..16"; } description "A list of interfaces where the sending of RIP packets is disabled."; } leaf-list non-passive-interface { when "../passive-default = 'true'"; type string { length "1..16"; } description "A list of interfaces where the sending of RIP packets is enabled."; } The 'when' statements guarantee that the list of passive interfaces is cleared when the "passive-interface default" command is entered (likewise, they guarantee that the list of non-passive interfaces is cleared when the "passive-interface default" command is removed). This matches exactly the behavior we want to model. Finally, move the 'passive_default' global variable into the 'rip' structure where it belongs. This fixed the bug where the "passive-interface default" command was being retained after a "no router rip" + "router rip". Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
}
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
void cli_show_rip_passive_interface(struct vty *vty,
const struct lyd_node *dnode,
ripd: retrofit the 'passive-interface' command to the new northbound model In ripd, the "passive-interface default" command has the following behavior: * All interfaces are converted to the passive mode; * The "passive-interface IFNAME" command becomes a no-operation and "passive-interface IFNAME" statements are removed from the running configuration. * The "no passive-interface IFNAME" can be used to remove interfaces from the passive mode. This command was modeled using the following YANG data nodes in the frr-ripd module: leaf passive-default { type boolean; default "false"; description "Control whether interfaces are in the passive mode by default or not."; } leaf-list passive-interface { when "../passive-default = 'false'"; type string { length "1..16"; } description "A list of interfaces where the sending of RIP packets is disabled."; } leaf-list non-passive-interface { when "../passive-default = 'true'"; type string { length "1..16"; } description "A list of interfaces where the sending of RIP packets is enabled."; } The 'when' statements guarantee that the list of passive interfaces is cleared when the "passive-interface default" command is entered (likewise, they guarantee that the list of non-passive interfaces is cleared when the "passive-interface default" command is removed). This matches exactly the behavior we want to model. Finally, move the 'passive_default' global variable into the 'rip' structure where it belongs. This fixed the bug where the "passive-interface default" command was being retained after a "no router rip" + "router rip". Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
bool show_defaults)
{
vty_out(vty, " passive-interface %s\n",
yang_dnode_get_string(dnode, NULL));
}
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
void cli_show_rip_non_passive_interface(struct vty *vty,
const struct lyd_node *dnode,
ripd: retrofit the 'passive-interface' command to the new northbound model In ripd, the "passive-interface default" command has the following behavior: * All interfaces are converted to the passive mode; * The "passive-interface IFNAME" command becomes a no-operation and "passive-interface IFNAME" statements are removed from the running configuration. * The "no passive-interface IFNAME" can be used to remove interfaces from the passive mode. This command was modeled using the following YANG data nodes in the frr-ripd module: leaf passive-default { type boolean; default "false"; description "Control whether interfaces are in the passive mode by default or not."; } leaf-list passive-interface { when "../passive-default = 'false'"; type string { length "1..16"; } description "A list of interfaces where the sending of RIP packets is disabled."; } leaf-list non-passive-interface { when "../passive-default = 'true'"; type string { length "1..16"; } description "A list of interfaces where the sending of RIP packets is enabled."; } The 'when' statements guarantee that the list of passive interfaces is cleared when the "passive-interface default" command is entered (likewise, they guarantee that the list of non-passive interfaces is cleared when the "passive-interface default" command is removed). This matches exactly the behavior we want to model. Finally, move the 'passive_default' global variable into the 'rip' structure where it belongs. This fixed the bug where the "passive-interface default" command was being retained after a "no router rip" + "router rip". Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
bool show_defaults)
{
vty_out(vty, " no passive-interface %s\n",
yang_dnode_get_string(dnode, NULL));
}
ripd: retrofit the 'redistribute' commands to the new northbound model Trivial conversion. As usual, combine multiple DEFUNs into a single DEFPY for simplicity. As a bonus of the northbound conversion, this commit fixes the redistribution of certain protocols into ripd. The 'redist_type' array used by the "redistribute" commands was terribly outdated, which was preventing the CLI to parse correctly certain protocols like isis and babel. Remove the route_map hooks installed by rip_route_map_init() since they were redundant (rip_init() already takes care of that). Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
/*
* XPath: /frr-ripd:ripd/instance/redistribute
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (rip_redistribute,
ripd: retrofit the 'redistribute' commands to the new northbound model Trivial conversion. As usual, combine multiple DEFUNs into a single DEFPY for simplicity. As a bonus of the northbound conversion, this commit fixes the redistribution of certain protocols into ripd. The 'redist_type' array used by the "redistribute" commands was terribly outdated, which was preventing the CLI to parse correctly certain protocols like isis and babel. Remove the route_map hooks installed by rip_route_map_init() since they were redundant (rip_init() already takes care of that). Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
rip_redistribute_cmd,
*: Use autocomplete for route-maps under commands that require it For example: ``` donatas-laptop# show bgp ipv4 unicast neighbors 127.0.0.2 advertised-routes route-map ? RMAP_NAME Name of the route map testas2 testas donatas-laptop(config)# router bgp donatas-laptop(config-router)# address-family ipv4 donatas-laptop(config-router-af)# redistribute connected route-map ? RMAP_NAME Pointer to route-map entries testas2 testas donatas-laptop(config-router-af)# network 192.168.0.0/23 route-map ? RMAP_NAME Name of the route map testas2 testas ``` Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2022-06-13 11:18:36 +02:00
"[no] redistribute " FRR_REDIST_STR_RIPD "$protocol [{metric (0-16)|route-map RMAP_NAME$route_map}]",
ripd: retrofit the 'redistribute' commands to the new northbound model Trivial conversion. As usual, combine multiple DEFUNs into a single DEFPY for simplicity. As a bonus of the northbound conversion, this commit fixes the redistribution of certain protocols into ripd. The 'redist_type' array used by the "redistribute" commands was terribly outdated, which was preventing the CLI to parse correctly certain protocols like isis and babel. Remove the route_map hooks installed by rip_route_map_init() since they were redundant (rip_init() already takes care of that). Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
NO_STR
REDIST_STR
FRR_REDIST_HELP_STR_RIPD
"Metric\n"
"Metric value\n"
"Route map reference\n"
"Pointer to route-map entries\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
if (!no) {
nb_cli_enqueue_change(vty, ".", NB_OP_CREATE, NULL);
nb_cli_enqueue_change(vty, "./route-map",
libs, rip, isis: change northbound operation enum to DESTROY Change the northbound lib operation from DELETE to DESTROY; make the required changes in the users of the northbound, in the cli, rip, ripng, and isis. Signed-off-by: Mark Stapp <mjs@voltanet.io>
2019-01-30 10:54:25 +01:00
route_map ? NB_OP_MODIFY : NB_OP_DESTROY,
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
route_map);
nb_cli_enqueue_change(vty, "./metric",
libs, rip, isis: change northbound operation enum to DESTROY Change the northbound lib operation from DELETE to DESTROY; make the required changes in the users of the northbound, in the cli, rip, ripng, and isis. Signed-off-by: Mark Stapp <mjs@voltanet.io>
2019-01-30 10:54:25 +01:00
metric_str ? NB_OP_MODIFY : NB_OP_DESTROY,
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
metric_str);
} else
libs, rip, isis: change northbound operation enum to DESTROY Change the northbound lib operation from DELETE to DESTROY; make the required changes in the users of the northbound, in the cli, rip, ripng, and isis. Signed-off-by: Mark Stapp <mjs@voltanet.io>
2019-01-30 10:54:25 +01:00
nb_cli_enqueue_change(vty, ".", NB_OP_DESTROY, NULL);
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
return nb_cli_apply_changes(vty, "./redistribute[protocol='%s']",
protocol);
ripd: retrofit the 'redistribute' commands to the new northbound model Trivial conversion. As usual, combine multiple DEFUNs into a single DEFPY for simplicity. As a bonus of the northbound conversion, this commit fixes the redistribution of certain protocols into ripd. The 'redist_type' array used by the "redistribute" commands was terribly outdated, which was preventing the CLI to parse correctly certain protocols like isis and babel. Remove the route_map hooks installed by rip_route_map_init() since they were redundant (rip_init() already takes care of that). Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
}
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
void cli_show_rip_redistribute(struct vty *vty, const struct lyd_node *dnode,
ripd: retrofit the 'redistribute' commands to the new northbound model Trivial conversion. As usual, combine multiple DEFUNs into a single DEFPY for simplicity. As a bonus of the northbound conversion, this commit fixes the redistribution of certain protocols into ripd. The 'redist_type' array used by the "redistribute" commands was terribly outdated, which was preventing the CLI to parse correctly certain protocols like isis and babel. Remove the route_map hooks installed by rip_route_map_init() since they were redundant (rip_init() already takes care of that). Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
bool show_defaults)
{
vty_out(vty, " redistribute %s",
yang_dnode_get_string(dnode, "./protocol"));
if (yang_dnode_exists(dnode, "./metric"))
vty_out(vty, " metric %s",
yang_dnode_get_string(dnode, "./metric"));
if (yang_dnode_exists(dnode, "./route-map"))
vty_out(vty, " route-map %s",
yang_dnode_get_string(dnode, "./route-map"));
vty_out(vty, "\n");
}
ripd: retrofit the 'route' command to the new northbound model Trivial conversion. Remove the rip->route routing table and associated code because this variable was used only to show the running configuration. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
/*
* XPath: /frr-ripd:ripd/instance/static-route
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (rip_route,
ripd: retrofit the 'route' command to the new northbound model Trivial conversion. Remove the rip->route routing table and associated code because this variable was used only to show the running configuration. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
rip_route_cmd,
"[no] route A.B.C.D/M",
NO_STR
"RIP static route configuration\n"
"IP prefix <network>/<length>\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
nb_cli_enqueue_change(vty, "./static-route",
libs, rip, isis: change northbound operation enum to DESTROY Change the northbound lib operation from DELETE to DESTROY; make the required changes in the users of the northbound, in the cli, rip, ripng, and isis. Signed-off-by: Mark Stapp <mjs@voltanet.io>
2019-01-30 10:54:25 +01:00
no ? NB_OP_DESTROY : NB_OP_CREATE, route_str);
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
return nb_cli_apply_changes(vty, NULL);
ripd: retrofit the 'route' command to the new northbound model Trivial conversion. Remove the rip->route routing table and associated code because this variable was used only to show the running configuration. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
}
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
void cli_show_rip_route(struct vty *vty, const struct lyd_node *dnode,
ripd: retrofit the 'route' command to the new northbound model Trivial conversion. Remove the rip->route routing table and associated code because this variable was used only to show the running configuration. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
bool show_defaults)
{
vty_out(vty, " route %s\n", yang_dnode_get_string(dnode, NULL));
}
ripd: retrofit the 'timer basic' command to the new northbound model Trivial conversion. Use the northbound 'apply_finish()' callback so we'll call rip_event() only once even if we change the three RIP timers at the same time. Convert the timers to uint32_t to match their representation in the YANG model. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
/*
* XPath: /frr-ripd:ripd/instance/timers
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (rip_timers,
ripd: retrofit the 'timer basic' command to the new northbound model Trivial conversion. Use the northbound 'apply_finish()' callback so we'll call rip_event() only once even if we change the three RIP timers at the same time. Convert the timers to uint32_t to match their representation in the YANG model. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
rip_timers_cmd,
"timers basic (5-2147483647)$update (5-2147483647)$timeout (5-2147483647)$garbage",
"Adjust routing timers\n"
"Basic routing protocol update timers\n"
"Routing table update timer value in second. Default is 30.\n"
"Routing information timeout timer. Default is 180.\n"
"Garbage collection timer. Default is 120.\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
nb_cli_enqueue_change(vty, "./update-interval", NB_OP_MODIFY,
update_str);
nb_cli_enqueue_change(vty, "./holddown-interval", NB_OP_MODIFY,
timeout_str);
nb_cli_enqueue_change(vty, "./flush-interval", NB_OP_MODIFY,
garbage_str);
return nb_cli_apply_changes(vty, "./timers");
ripd: retrofit the 'timer basic' command to the new northbound model Trivial conversion. Use the northbound 'apply_finish()' callback so we'll call rip_event() only once even if we change the three RIP timers at the same time. Convert the timers to uint32_t to match their representation in the YANG model. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
}
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (no_rip_timers,
ripd: retrofit the 'timer basic' command to the new northbound model Trivial conversion. Use the northbound 'apply_finish()' callback so we'll call rip_event() only once even if we change the three RIP timers at the same time. Convert the timers to uint32_t to match their representation in the YANG model. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
no_rip_timers_cmd,
"no timers basic [(5-2147483647) (5-2147483647) (5-2147483647)]",
NO_STR
"Adjust routing timers\n"
"Basic routing protocol update timers\n"
"Routing table update timer value in second. Default is 30.\n"
"Routing information timeout timer. Default is 180.\n"
"Garbage collection timer. Default is 120.\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
nb_cli_enqueue_change(vty, "./update-interval", NB_OP_MODIFY, NULL);
nb_cli_enqueue_change(vty, "./holddown-interval", NB_OP_MODIFY, NULL);
nb_cli_enqueue_change(vty, "./flush-interval", NB_OP_MODIFY, NULL);
return nb_cli_apply_changes(vty, "./timers");
ripd: retrofit the 'timer basic' command to the new northbound model Trivial conversion. Use the northbound 'apply_finish()' callback so we'll call rip_event() only once even if we change the three RIP timers at the same time. Convert the timers to uint32_t to match their representation in the YANG model. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
}
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
void cli_show_rip_timers(struct vty *vty, const struct lyd_node *dnode,
ripd: retrofit the 'timer basic' command to the new northbound model Trivial conversion. Use the northbound 'apply_finish()' callback so we'll call rip_event() only once even if we change the three RIP timers at the same time. Convert the timers to uint32_t to match their representation in the YANG model. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
bool show_defaults)
{
vty_out(vty, " timers basic %s %s %s\n",
yang_dnode_get_string(dnode, "./update-interval"),
yang_dnode_get_string(dnode, "./holddown-interval"),
yang_dnode_get_string(dnode, "./flush-interval"));
}
ripd: retrofit the 'version' command to the new northbound model Trivial conversion. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
/*
* XPath: /frr-ripd:ripd/instance/version
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (rip_version,
ripd: retrofit the 'version' command to the new northbound model Trivial conversion. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
rip_version_cmd,
"version (1-2)",
"Set routing protocol version\n"
"version\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
nb_cli_enqueue_change(vty, "./version/receive", NB_OP_MODIFY,
version_str);
nb_cli_enqueue_change(vty, "./version/send", NB_OP_MODIFY, version_str);
return nb_cli_apply_changes(vty, NULL);
ripd: retrofit the 'version' command to the new northbound model Trivial conversion. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
}
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (no_rip_version,
ripd: retrofit the 'version' command to the new northbound model Trivial conversion. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
no_rip_version_cmd,
"no version [(1-2)]",
NO_STR
"Set routing protocol version\n"
"version\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
nb_cli_enqueue_change(vty, "./version/receive", NB_OP_MODIFY, NULL);
nb_cli_enqueue_change(vty, "./version/send", NB_OP_MODIFY, NULL);
return nb_cli_apply_changes(vty, NULL);
ripd: retrofit the 'version' command to the new northbound model Trivial conversion. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
}
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
void cli_show_rip_version(struct vty *vty, const struct lyd_node *dnode,
ripd: retrofit the 'version' command to the new northbound model Trivial conversion. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
bool show_defaults)
{
/*
* We have only one "version" command and three possible combinations of
* send/receive values.
*/
switch (yang_dnode_get_enum(dnode, "./receive")) {
case RI_RIP_VERSION_1:
vty_out(vty, " version 1\n");
break;
case RI_RIP_VERSION_2:
vty_out(vty, " version 2\n");
break;
case RI_RIP_VERSION_1_AND_2:
vty_out(vty, " no version\n");
break;
}
}
ripd: support BFD integration Implement RIP peer monitoring with BFD. RFC 5882 Generic Application of Bidirectional Forwarding Detection (BFD), Section 10.3 Interactions with RIP. Co-authored-by: Renato Westphal <renato@opensourcerouting.org> Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
2021-10-14 17:12:37 +02:00
/*
* XPath: /frr-ripd:ripd/instance/default-bfd-profile
*/
DEFPY_YANG(rip_bfd_default_profile, rip_bfd_default_profile_cmd,
"bfd default-profile BFDPROF$profile",
"Bidirectional Forwarding Detection\n"
"BFD default profile\n"
"Profile name\n")
{
nb_cli_enqueue_change(vty, "./default-bfd-profile", NB_OP_MODIFY,
profile);
return nb_cli_apply_changes(vty, NULL);
}
DEFPY_YANG(no_rip_bfd_default_profile, no_rip_bfd_default_profile_cmd,
"no bfd default-profile [BFDPROF]",
NO_STR
"Bidirectional Forwarding Detection\n"
"BFD default profile\n"
"Profile name\n")
{
nb_cli_enqueue_change(vty, "./default-bfd-profile", NB_OP_DESTROY,
NULL);
return nb_cli_apply_changes(vty, NULL);
}
void cli_show_ripd_instance_default_bfd_profile(struct vty *vty,
const struct lyd_node *dnode,
bool show_defaults)
{
vty_out(vty, " bfd default-profile %s\n",
yang_dnode_get_string(dnode, NULL));
}
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
/*
* XPath: /frr-interface:lib/interface/frr-ripd:rip/split-horizon
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (ip_rip_split_horizon,
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
ip_rip_split_horizon_cmd,
"[no] ip rip split-horizon [poisoned-reverse$poisoned_reverse]",
NO_STR
IP_STR
"Routing Information Protocol\n"
"Perform split horizon\n"
"With poisoned-reverse\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
const char *value;
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
if (no)
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
value = "disabled";
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
else if (poisoned_reverse)
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
value = "poison-reverse";
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
else
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
value = "simple";
nb_cli_enqueue_change(vty, "./split-horizon", NB_OP_MODIFY, value);
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
return nb_cli_apply_changes(vty, "./frr-ripd:rip");
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
}
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
void cli_show_ip_rip_split_horizon(struct vty *vty,
const struct lyd_node *dnode,
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
bool show_defaults)
{
int value;
value = yang_dnode_get_enum(dnode, NULL);
switch (value) {
case RIP_NO_SPLIT_HORIZON:
vty_out(vty, " no ip rip split-horizon\n");
break;
case RIP_SPLIT_HORIZON:
vty_out(vty, " ip rip split-horizon\n");
break;
case RIP_SPLIT_HORIZON_POISONED_REVERSE:
vty_out(vty, " ip rip split-horizon poisoned-reverse\n");
break;
}
}
/*
* XPath: /frr-interface:lib/interface/frr-ripd:rip/v2-broadcast
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (ip_rip_v2_broadcast,
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
ip_rip_v2_broadcast_cmd,
"[no] ip rip v2-broadcast",
NO_STR
IP_STR
"Routing Information Protocol\n"
"Send ip broadcast v2 update\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
nb_cli_enqueue_change(vty, "./v2-broadcast", NB_OP_MODIFY,
no ? "false" : "true");
return nb_cli_apply_changes(vty, "./frr-ripd:rip");
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
}
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
void cli_show_ip_rip_v2_broadcast(struct vty *vty, const struct lyd_node *dnode,
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
bool show_defaults)
{
if (!yang_dnode_get_bool(dnode, NULL))
vty_out(vty, " no");
vty_out(vty, " ip rip v2-broadcast\n");
}
/*
* XPath: /frr-interface:lib/interface/frr-ripd:rip/version-receive
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (ip_rip_receive_version,
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
ip_rip_receive_version_cmd,
"ip rip receive version <{1$v1|2$v2}|none>",
IP_STR
"Routing Information Protocol\n"
"Advertisement reception\n"
"Version control\n"
"RIP version 1\n"
"RIP version 2\n"
"None\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
const char *value;
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
if (v1 && v2)
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
value = "both";
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
else if (v1)
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
value = "1";
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
else if (v2)
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
value = "2";
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
else
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
value = "none";
nb_cli_enqueue_change(vty, "./version-receive", NB_OP_MODIFY, value);
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
return nb_cli_apply_changes(vty, "./frr-ripd:rip");
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
}
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (no_ip_rip_receive_version,
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
no_ip_rip_receive_version_cmd,
"no ip rip receive version [<{1|2}|none>]",
NO_STR
IP_STR
"Routing Information Protocol\n"
"Advertisement reception\n"
"Version control\n"
"RIP version 1\n"
"RIP version 2\n"
"None\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
nb_cli_enqueue_change(vty, "./version-receive", NB_OP_MODIFY, NULL);
return nb_cli_apply_changes(vty, "./frr-ripd:rip");
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
}
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
void cli_show_ip_rip_receive_version(struct vty *vty,
const struct lyd_node *dnode,
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
bool show_defaults)
{
switch (yang_dnode_get_enum(dnode, NULL)) {
case RI_RIP_UNSPEC:
vty_out(vty, " no ip rip receive version\n");
break;
case RI_RIP_VERSION_1:
vty_out(vty, " ip rip receive version 1\n");
break;
case RI_RIP_VERSION_2:
vty_out(vty, " ip rip receive version 2\n");
break;
case RI_RIP_VERSION_1_AND_2:
vty_out(vty, " ip rip receive version 1 2\n");
break;
case RI_RIP_VERSION_NONE:
vty_out(vty, " ip rip receive version none\n");
break;
}
}
/*
* XPath: /frr-interface:lib/interface/frr-ripd:rip/version-send
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (ip_rip_send_version,
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
ip_rip_send_version_cmd,
"ip rip send version <{1$v1|2$v2}|none>",
IP_STR
"Routing Information Protocol\n"
"Advertisement transmission\n"
"Version control\n"
"RIP version 1\n"
"RIP version 2\n"
"None\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
const char *value;
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
if (v1 && v2)
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
value = "both";
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
else if (v1)
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
value = "1";
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
else if (v2)
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
value = "2";
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
else
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
value = "none";
nb_cli_enqueue_change(vty, "./version-send", NB_OP_MODIFY, value);
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
return nb_cli_apply_changes(vty, "./frr-ripd:rip");
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
}
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (no_ip_rip_send_version,
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
no_ip_rip_send_version_cmd,
"no ip rip send version [<{1|2}|none>]",
NO_STR
IP_STR
"Routing Information Protocol\n"
"Advertisement transmission\n"
"Version control\n"
"RIP version 1\n"
"RIP version 2\n"
"None\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
nb_cli_enqueue_change(vty, "./version-send", NB_OP_MODIFY, NULL);
return nb_cli_apply_changes(vty, "./frr-ripd:rip");
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
}
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
void cli_show_ip_rip_send_version(struct vty *vty, const struct lyd_node *dnode,
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
bool show_defaults)
{
switch (yang_dnode_get_enum(dnode, NULL)) {
case RI_RIP_UNSPEC:
vty_out(vty, " no ip rip send version\n");
break;
case RI_RIP_VERSION_1:
vty_out(vty, " ip rip send version 1\n");
break;
case RI_RIP_VERSION_2:
vty_out(vty, " ip rip send version 2\n");
break;
case RI_RIP_VERSION_1_AND_2:
vty_out(vty, " ip rip send version 1 2\n");
break;
case RI_RIP_VERSION_NONE:
vty_out(vty, " ip rip send version none\n");
break;
}
}
/*
* XPath: /frr-interface:lib/interface/frr-ripd:rip/authentication-scheme
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (ip_rip_authentication_mode,
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
ip_rip_authentication_mode_cmd,
"ip rip authentication mode <md5$mode [auth-length <rfc|old-ripd>$auth_length]|text$mode>",
IP_STR
"Routing Information Protocol\n"
"Authentication control\n"
"Authentication mode\n"
"Keyed message digest\n"
"MD5 authentication data length\n"
"RFC compatible\n"
"Old ripd compatible\n"
"Clear text authentication\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
const char *value = NULL;
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
if (auth_length) {
if (strmatch(auth_length, "rfc"))
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
value = "16";
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
else
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
value = "20";
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
}
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
nb_cli_enqueue_change(vty, "./authentication-scheme/mode", NB_OP_MODIFY,
strmatch(mode, "md5") ? "md5" : "plain-text");
ripd: fix problems with the "ip rip authentication" command libyang-0.16-r3 doesn't allow the creation of data nodes if their corresponding "when" statement (if any) resolves to false. This change broke the "ip rip authentication" command. This commit adapts this command so that it's not affected by the new libyang stricter validation checks. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2019-04-05 03:28:00 +02:00
if (strmatch(mode, "md5"))
nb_cli_enqueue_change(vty,
"./authentication-scheme/md5-auth-length",
NB_OP_MODIFY, value);
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
return nb_cli_apply_changes(vty, "./frr-ripd:rip");
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
}
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (no_ip_rip_authentication_mode,
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
no_ip_rip_authentication_mode_cmd,
"no ip rip authentication mode [<md5 [auth-length <rfc|old-ripd>]|text>]",
NO_STR
IP_STR
"Routing Information Protocol\n"
"Authentication control\n"
"Authentication mode\n"
"Keyed message digest\n"
"MD5 authentication data length\n"
"RFC compatible\n"
"Old ripd compatible\n"
"Clear text authentication\n")
{
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
nb_cli_enqueue_change(vty, "./authentication-scheme/mode", NB_OP_MODIFY,
NULL);
nb_cli_enqueue_change(vty, "./authentication-scheme/md5-auth-length",
ripd: fix problems with the "ip rip authentication" command libyang-0.16-r3 doesn't allow the creation of data nodes if their corresponding "when" statement (if any) resolves to false. This change broke the "ip rip authentication" command. This commit adapts this command so that it's not affected by the new libyang stricter validation checks. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2019-04-05 03:28:00 +02:00
NB_OP_DESTROY, NULL);
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
return nb_cli_apply_changes(vty, "./frr-ripd:rip");
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
}
void cli_show_ip_rip_authentication_scheme(struct vty *vty,
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
const struct lyd_node *dnode,
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
bool show_defaults)
{
switch (yang_dnode_get_enum(dnode, "./mode")) {
case RIP_NO_AUTH:
vty_out(vty, " no ip rip authentication mode\n");
break;
case RIP_AUTH_SIMPLE_PASSWORD:
vty_out(vty, " ip rip authentication mode text\n");
break;
case RIP_AUTH_MD5:
vty_out(vty, " ip rip authentication mode md5");
if (show_defaults
|| !yang_dnode_is_default(dnode, "./md5-auth-length")) {
if (yang_dnode_get_enum(dnode, "./md5-auth-length")
== RIP_AUTH_MD5_SIZE)
vty_out(vty, " auth-length rfc");
else
vty_out(vty, " auth-length old-ripd");
}
vty_out(vty, "\n");
break;
}
}
/*
* XPath: /frr-interface:lib/interface/frr-ripd:rip/authentication-password
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (ip_rip_authentication_string,
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
ip_rip_authentication_string_cmd,
"ip rip authentication string LINE$password",
IP_STR
"Routing Information Protocol\n"
"Authentication control\n"
"Authentication string\n"
"Authentication string\n")
{
if (strlen(password) > 16) {
vty_out(vty,
"%% RIPv2 authentication string must be shorter than 16\n");
return CMD_WARNING_CONFIG_FAILED;
}
lib: adapt to version 2 of libyang Compile with v2.0.0 tag of `libyang2` branch of: https://github.com/CESNET/libyang staticd init load time of 10k routes now 6s vs ly1 time of 150s Signed-off-by: Christian Hopps <chopps@labn.net>
2021-05-04 16:41:58 +02:00
if (yang_dnode_existsf(vty->candidate_config->dnode, "%s%s",
VTY_CURR_XPATH,
"/frr-ripd:rip/authentication-key-chain")) {
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
vty_out(vty, "%% key-chain configuration exists\n");
return CMD_WARNING_CONFIG_FAILED;
}
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
nb_cli_enqueue_change(vty, "./authentication-password", NB_OP_MODIFY,
password);
return nb_cli_apply_changes(vty, "./frr-ripd:rip");
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
}
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (no_ip_rip_authentication_string,
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
no_ip_rip_authentication_string_cmd,
"no ip rip authentication string [LINE]",
NO_STR
IP_STR
"Routing Information Protocol\n"
"Authentication control\n"
"Authentication string\n"
"Authentication string\n")
{
Merge remote-tracking branch 'frr/master' into rip-vrf Merge commit to solve a bunch of conflicts with other PRs that were merged in the previous weeks. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2019-03-02 19:00:46 +01:00
nb_cli_enqueue_change(vty, "./authentication-password", NB_OP_DESTROY,
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
NULL);
return nb_cli_apply_changes(vty, "./frr-ripd:rip");
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
}
void cli_show_ip_rip_authentication_string(struct vty *vty,
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
const struct lyd_node *dnode,
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
bool show_defaults)
{
vty_out(vty, " ip rip authentication string %s\n",
yang_dnode_get_string(dnode, NULL));
}
/*
* XPath: /frr-interface:lib/interface/frr-ripd:rip/authentication-key-chain
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (ip_rip_authentication_key_chain,
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
ip_rip_authentication_key_chain_cmd,
"ip rip authentication key-chain LINE$keychain",
IP_STR
"Routing Information Protocol\n"
"Authentication control\n"
"Authentication key-chain\n"
"name of key-chain\n")
{
lib: adapt to version 2 of libyang Compile with v2.0.0 tag of `libyang2` branch of: https://github.com/CESNET/libyang staticd init load time of 10k routes now 6s vs ly1 time of 150s Signed-off-by: Christian Hopps <chopps@labn.net>
2021-05-04 16:41:58 +02:00
if (yang_dnode_existsf(vty->candidate_config->dnode, "%s%s",
VTY_CURR_XPATH,
"/frr-ripd:rip/authentication-password")) {
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
vty_out(vty, "%% authentication string configuration exists\n");
return CMD_WARNING_CONFIG_FAILED;
}
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
nb_cli_enqueue_change(vty, "./authentication-key-chain", NB_OP_MODIFY,
keychain);
return nb_cli_apply_changes(vty, "./frr-ripd:rip");
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
}
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (no_ip_rip_authentication_key_chain,
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
no_ip_rip_authentication_key_chain_cmd,
"no ip rip authentication key-chain [LINE]",
NO_STR
IP_STR
"Routing Information Protocol\n"
"Authentication control\n"
"Authentication key-chain\n"
"name of key-chain\n")
{
libs, rip, isis: change northbound operation enum to DESTROY Change the northbound lib operation from DELETE to DESTROY; make the required changes in the users of the northbound, in the cli, rip, ripng, and isis. Signed-off-by: Mark Stapp <mjs@voltanet.io>
2019-01-30 10:54:25 +01:00
nb_cli_enqueue_change(vty, "./authentication-key-chain", NB_OP_DESTROY,
lib, ripd: rework API for converted CLI commands When editing the candidate configuration, the northbound must ensure that either all changes made by a command are accepted or none are. This is done to prevent inconsistent states where only parts of a command are applied in the event any error happens. The previous API for converted commands, the nb_cli_cfg_change() function, required callers to pass an array containing all changes that needed to be applied in the candidate configuration. The problem with this API is that it was very inconvenient for complex commands, which change different configuration options depending on several factors. This required users to manipulate the array of configuration changes using low-level primitives, making it complicated to implement some commands. To solve this problem, introduce a new API based on the two following functions: - nb_cli_enqueue_change() - nb_cli_apply_changes() The first function is used to enqueue configuration changes, one at time. Then the nb_cli_apply_changes() function is used to apply all the enqueued configuration changes. To implement this, a static-sized array was allocated in the "vty" structure, along with a counter of enqueued changes. This eliminates the need to declare an array of configuration changes in every converted CLI command, simplifying things quite considerably. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-11-26 18:30:14 +01:00
NULL);
return nb_cli_apply_changes(vty, "./frr-ripd:rip");
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
}
void cli_show_ip_rip_authentication_key_chain(struct vty *vty,
lib: northbound cli show/cmd functions must not modify data nodes To ensure this, add a const modifier to functions' arguments. Would be great do this initially and avoid this large code change, but better late than never. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-10-13 19:08:37 +02:00
const struct lyd_node *dnode,
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
bool show_defaults)
{
vty_out(vty, " ip rip authentication key-chain %s\n",
yang_dnode_get_string(dnode, NULL));
}
ripd: support BFD integration Implement RIP peer monitoring with BFD. RFC 5882 Generic Application of Bidirectional Forwarding Detection (BFD), Section 10.3 Interactions with RIP. Co-authored-by: Renato Westphal <renato@opensourcerouting.org> Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
2021-10-14 17:12:37 +02:00
/*
* XPath: /frr-interface:lib/interface/frr-ripd:rip/bfd-monitoring/enable
*/
DEFPY_YANG(ip_rip_bfd, ip_rip_bfd_cmd, "[no] ip rip bfd",
NO_STR IP_STR
"Routing Information Protocol\n"
"Enable BFD support\n")
{
nb_cli_enqueue_change(vty, "./bfd-monitoring/enable", NB_OP_MODIFY,
no ? "false" : "true");
return nb_cli_apply_changes(vty, "./frr-ripd:rip");
}
void cli_show_ip_rip_bfd_enable(struct vty *vty, const struct lyd_node *dnode,
bool show_defaults)
{
vty_out(vty, " ip rip bfd\n");
}
/*
* XPath: /frr-interface:lib/interface/frr-ripd:rip/bfd/profile
*/
DEFPY_YANG(ip_rip_bfd_profile, ip_rip_bfd_profile_cmd,
"[no] ip rip bfd profile BFDPROF$profile",
NO_STR IP_STR
"Routing Information Protocol\n"
"Enable BFD support\n"
"Use a pre-configured profile\n"
"Profile name\n")
{
if (no)
nb_cli_enqueue_change(vty, "./bfd-monitoring/profile",
NB_OP_DESTROY, NULL);
else
nb_cli_enqueue_change(vty, "./bfd-monitoring/profile",
NB_OP_MODIFY, profile);
return nb_cli_apply_changes(vty, "./frr-ripd:rip");
}
DEFPY_YANG(no_ip_rip_bfd_profile, no_ip_rip_bfd_profile_cmd,
"no ip rip bfd profile",
NO_STR IP_STR
"Routing Information Protocol\n"
"Enable BFD support\n"
"Use a pre-configured profile\n")
{
nb_cli_enqueue_change(vty, "./bfd-monitoring/profile", NB_OP_DESTROY,
NULL);
return nb_cli_apply_changes(vty, "./frr-ripd:rip");
}
void cli_show_ip_rip_bfd_profile(struct vty *vty, const struct lyd_node *dnode,
bool show_defaults)
{
vty_out(vty, " ip rip bfd profile %s\n",
yang_dnode_get_string(dnode, NULL));
}
ripd: implement the 'clear-rip-route' YANG RPC This command deletes all received routes from the RIP routing table. It should be used with caution as it can create black holes in the network until RIP reconverges. Very useful to make automated testing (e.g. ANVL) more predictable, since the internal state of ripd can be cleared after each test. Implement the command using a YANG RPC so that it can be executed by other northbound clients in addition to the CLI. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:04 +02:00
/*
* XPath: /frr-ripd:clear-rip-route
*/
*: introduce DEFPY_YANG & friends DEFPY_YANG will allow the CLI to identify which commands are YANG-modeled or not before executing them. This is going to be useful for the upcoming configuration back-off timer work that needs to commit pending configuration changes before executing a command that isn't YANG-modeled. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2020-07-06 17:47:44 +02:00
DEFPY_YANG (clear_ip_rip,
ripd: implement the 'clear-rip-route' YANG RPC This command deletes all received routes from the RIP routing table. It should be used with caution as it can create black holes in the network until RIP reconverges. Very useful to make automated testing (e.g. ANVL) more predictable, since the internal state of ripd can be cleared after each test. Implement the command using a YANG RPC so that it can be executed by other northbound clients in addition to the CLI. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:04 +02:00
clear_ip_rip_cmd,
ripd: add vrf input parameter to the "clear-rip-route" RPC Description of the new parameter (adapted from the ietf-rip module): "VRF name identifying a specific RIP instance. This leaf is optional for the rpc. If it is specified, the rpc will clear all routes in the specified RIP instance; if it is not specified, the rpc will clear all routes in all RIP instances."; Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2019-01-04 22:08:10 +01:00
"clear ip rip [vrf WORD]",
ripd: implement the 'clear-rip-route' YANG RPC This command deletes all received routes from the RIP routing table. It should be used with caution as it can create black holes in the network until RIP reconverges. Very useful to make automated testing (e.g. ANVL) more predictable, since the internal state of ripd can be cleared after each test. Implement the command using a YANG RPC so that it can be executed by other northbound clients in addition to the CLI. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:04 +02:00
CLEAR_STR
IP_STR
ripd: add vrf input parameter to the "clear-rip-route" RPC Description of the new parameter (adapted from the ietf-rip module): "VRF name identifying a specific RIP instance. This leaf is optional for the rpc. If it is specified, the rpc will clear all routes in the specified RIP instance; if it is not specified, the rpc will clear all routes in all RIP instances."; Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2019-01-04 22:08:10 +01:00
"Clear IP RIP database\n"
VRF_CMD_HELP_STR)
ripd: implement the 'clear-rip-route' YANG RPC This command deletes all received routes from the RIP routing table. It should be used with caution as it can create black holes in the network until RIP reconverges. Very useful to make automated testing (e.g. ANVL) more predictable, since the internal state of ripd can be cleared after each test. Implement the command using a YANG RPC so that it can be executed by other northbound clients in addition to the CLI. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:04 +02:00
{
ripd: add vrf input parameter to the "clear-rip-route" RPC Description of the new parameter (adapted from the ietf-rip module): "VRF name identifying a specific RIP instance. This leaf is optional for the rpc. If it is specified, the rpc will clear all routes in the specified RIP instance; if it is not specified, the rpc will clear all routes in all RIP instances."; Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2019-01-04 22:08:10 +01:00
struct list *input;
ripd, ripngd: Free up list after call into nb_cli_rpc We have a clear memory leak after running `clear ip rip` Fix this. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2019-12-13 00:48:04 +01:00
int ret;
ripd: add vrf input parameter to the "clear-rip-route" RPC Description of the new parameter (adapted from the ietf-rip module): "VRF name identifying a specific RIP instance. This leaf is optional for the rpc. If it is specified, the rpc will clear all routes in the specified RIP instance; if it is not specified, the rpc will clear all routes in all RIP instances."; Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2019-01-04 22:08:10 +01:00
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);
}
*: add errmsg to nb rpc Display human readable error message in northbound rpc transaction failure. In case of vtysh nb client, the error message will be displayed to user. Testing: bharat# clear evpn dup-addr vni 1002 ip 11.11.11.11 Error type: generic error Error description: Requested IP's associated MAC aa:aa:aa:aa:aa:aa is still in duplicate state Signed-off-by: Chirag Shah <chirag@nvidia.com>
2020-10-04 00:34:33 +02:00
ret = nb_cli_rpc(vty, "/frr-ripd:clear-rip-route", input, NULL);
ripd, ripngd: Free up list after call into nb_cli_rpc We have a clear memory leak after running `clear ip rip` Fix this. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2019-12-13 00:48:04 +01:00
list_delete(&input);
return ret;
ripd: implement the 'clear-rip-route' YANG RPC This command deletes all received routes from the RIP routing table. It should be used with caution as it can create black holes in the network until RIP reconverges. Very useful to make automated testing (e.g. ANVL) more predictable, since the internal state of ripd can be cleared after each test. Implement the command using a YANG RPC so that it can be executed by other northbound clients in addition to the CLI. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:04 +02:00
}
lib, ripd, ripngd, vtysh: Move distribute list to `correct` spot Allow the `distribute-list...` command in ripd and ripngd to work correctly. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2021-02-08 17:36:05 +01:00
DEFUN (rip_distribute_list,
rip_distribute_list_cmd,
lib: Add autocomplete for access-lists Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
2021-10-21 21:52:14 +02:00
"distribute-list [prefix] ACCESSLIST4_NAME <in|out> [WORD]",
lib, ripd, ripngd, vtysh: Move distribute list to `correct` spot Allow the `distribute-list...` command in ripd and ripngd to work correctly. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2021-02-08 17:36:05 +01:00
"Filter networks in routing updates\n"
"Specify a prefix\n"
"Access-list name\n"
"Filter incoming routing updates\n"
"Filter outgoing routing updates\n"
"Interface name\n")
{
const char *ifname = NULL;
int prefix = (argv[1]->type == WORD_TKN) ? 1 : 0;
if (argv[argc - 1]->type == VARIABLE_TKN)
ifname = argv[argc - 1]->arg;
return distribute_list_parser(prefix, true, argv[2 + prefix]->text,
argv[1 + prefix]->arg, ifname);
}
DEFUN (rip_no_distribute_list,
rip_no_distribute_list_cmd,
lib: Add autocomplete for access-lists Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
2021-10-21 21:52:14 +02:00
"no distribute-list [prefix] ACCESSLIST4_NAME <in|out> [WORD]",
lib, ripd, ripngd, vtysh: Move distribute list to `correct` spot Allow the `distribute-list...` command in ripd and ripngd to work correctly. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2021-02-08 17:36:05 +01:00
NO_STR
"Filter networks in routing updates\n"
"Specify a prefix\n"
"Access-list name\n"
"Filter incoming routing updates\n"
"Filter outgoing routing updates\n"
"Interface name\n")
{
const char *ifname = NULL;
int prefix = (argv[2]->type == WORD_TKN) ? 1 : 0;
if (argv[argc - 1]->type == VARIABLE_TKN)
ifname = argv[argc - 1]->arg;
return distribute_list_no_parser(vty, prefix, true,
argv[3 + prefix]->text,
argv[2 + prefix]->arg, ifname);
}
yang, ripd: add 'frr-ripd.yang' and associated stub callbacks Introduce frr-ripd.yang, which defines a model for managing the FRR ripd daemon. Also add frr-route-types.yang which defines typedefs for FRR route types. Update the 'frr_yang_module_info' array of ripd with the new 'frr-ripd' module. Add two new files (rip_cli.[ch]) which should contain all ripd commands converted to the new northbound model. Centralizing all commands in a single place will facilitate the process of moving the CLI to a separate program in the future. Add automatically generated stub callbacks in rip_northbound.c. These callbacks will be implemented gradually in the following commits. Add example JSON/XML ripd configurations in yang/examples/. Add the confd.frr-ripd.yang YANG module with annotations specific to the ConfD daemon. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:57 +02:00
void rip_cli_init(void)
{
ripd: retrofit the 'router rip' command to the new northbound model * Implement the northbound callbacks associated to the '/frr-ripd:ripd/instance' YANG path (the code is mostly a copy and paste from the original "router rip" DEFUNs); * Move rip_create_socket() out of rip_create() since creating a socket is an error-prone operation and thus needs to be performed separately during the NB_EV_PREPARE phase; * On rip_create(), fetch the defaults from the frr-ripd YANG model; * Convert the "[no] router rip" CLI commands to be dumb wrappers around the northbound callbacks; * On config_write_rip(), write logic to call all 'cli_show' northbound callbacks defined under the '/frr-ripd:ripd/instance' YANG path. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
install_element(CONFIG_NODE, &router_rip_cmd);
install_element(CONFIG_NODE, &no_router_rip_cmd);
ripd: retrofit the 'allow-ecmp' command to the new northbound model Trivial conversion. The rip->ecmp variable was converted to a boolean to match the way it's defined in the YANG module. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
lib, ripd, ripngd, vtysh: Move distribute list to `correct` spot Allow the `distribute-list...` command in ripd and ripngd to work correctly. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2021-02-08 17:36:05 +01:00
install_element(RIP_NODE, &rip_distribute_list_cmd);
install_element(RIP_NODE, &rip_no_distribute_list_cmd);
ripd: retrofit the 'allow-ecmp' command to the new northbound model Trivial conversion. The rip->ecmp variable was converted to a boolean to match the way it's defined in the YANG module. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
install_element(RIP_NODE, &rip_allow_ecmp_cmd);
ripd: Implement `allow-ecmp X` command Allow setting an arbitrary number of paths to be installed instead of ALL. Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2023-05-04 08:13:07 +02:00
install_element(RIP_NODE, &no_rip_allow_ecmp_cmd);
ripd: retrofit the 'default-information' command to the new northbound model Trivial conversion. 'rip->default_information_route_map' was removed since it wasn't being used anywhere. 'rip->default_information' was removed too because it was being used only to display the running configuration and thus is not necessary anymore. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:58 +02:00
install_element(RIP_NODE, &rip_default_information_originate_cmd);
ripd: retrofit the 'default-metric' command to the new northbound model Trivial conversion. rip->default_metric was converted to an uint8_t to match the way it's defined in the YANG module. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
install_element(RIP_NODE, &rip_default_metric_cmd);
install_element(RIP_NODE, &no_rip_default_metric_cmd);
ripd: retrofit the 'distance' command to the new northbound model Trivial conversion. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
install_element(RIP_NODE, &rip_distance_cmd);
install_element(RIP_NODE, &no_rip_distance_cmd);
ripd: retrofit the 'distance source' commands to the new northbound model The "distance (1-255) A.B.C.D/M [WORD]" command was modeled using a YANG list, which makes it a little bit more complicated to convert to the new northbound model. The rip_distance_set() and rip_distance_unset() functions were removed since they set/unset multiple configuration options at the same time. The northbound callbacks need to set/unset configuration options individually. When a distance list is created, use yang_dnode_set_entry() to store a pointer in the configuration node, and retrieve this pointer in the other callbacks using yang_dnode_get_entry(). The 'rip_distance' structure was moved to ripd.h so that it can be used in the rip_northbound.c file. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
install_element(RIP_NODE, &rip_distance_source_cmd);
ripd: retrofit the 'neighbor' command to the new northbound model Make rip_neighbor_add() and rip_neighbor_delete() return northbound error codes since their return values are used as the return value of some northbound callbacks. These functions shouldn't fail in normal conditions because the northbound layer guarantees it will never call the 'create' or 'delete' callback more than once for the same object. Hence any failure in those functions would indicate an internal inconsistency that needs to be investigated (by returning NB_ERR the northbound will log a detailed error message indicating the xpath of the object, the event and the callback where the error happened). Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:59 +02:00
install_element(RIP_NODE, &rip_neighbor_cmd);
ripd: retrofit the 'network' command to the new northbound model The frr-ripd YANG module models the ripd "network" command using two separate leaf-lists for simplicity: one leaf-list for interfaces and another leaf-list for actual networks. In the 'cli_show' callbacks, display the "network" command for entries of both leaf-lists. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
install_element(RIP_NODE, &rip_network_prefix_cmd);
install_element(RIP_NODE, &rip_network_if_cmd);
ripd: retrofit the 'offset-list' command to the new northbound model Remove the rip_offset_list_set() and rip_offset_list_unset() functions since they set/unset multiple configuration options at the same time. The northbound callbacks need to set/unset configuration options individually. The frr-ripd YANG module models the "offset-list" command using a list keyed by the 'interface' and 'direction' leafs. One important detail is that the IFNAME parameter is optional, and when it's not present it means we want to match all interfaces. This is modeled using an interface name of '*' since key lists are mandatory by definition in YANG. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
install_element(RIP_NODE, &rip_offset_list_cmd);
ripd: retrofit the 'passive-interface' command to the new northbound model In ripd, the "passive-interface default" command has the following behavior: * All interfaces are converted to the passive mode; * The "passive-interface IFNAME" command becomes a no-operation and "passive-interface IFNAME" statements are removed from the running configuration. * The "no passive-interface IFNAME" can be used to remove interfaces from the passive mode. This command was modeled using the following YANG data nodes in the frr-ripd module: leaf passive-default { type boolean; default "false"; description "Control whether interfaces are in the passive mode by default or not."; } leaf-list passive-interface { when "../passive-default = 'false'"; type string { length "1..16"; } description "A list of interfaces where the sending of RIP packets is disabled."; } leaf-list non-passive-interface { when "../passive-default = 'true'"; type string { length "1..16"; } description "A list of interfaces where the sending of RIP packets is enabled."; } The 'when' statements guarantee that the list of passive interfaces is cleared when the "passive-interface default" command is entered (likewise, they guarantee that the list of non-passive interfaces is cleared when the "passive-interface default" command is removed). This matches exactly the behavior we want to model. Finally, move the 'passive_default' global variable into the 'rip' structure where it belongs. This fixed the bug where the "passive-interface default" command was being retained after a "no router rip" + "router rip". Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:00 +02:00
install_element(RIP_NODE, &rip_passive_default_cmd);
install_element(RIP_NODE, &rip_passive_interface_cmd);
ripd: retrofit the 'redistribute' commands to the new northbound model Trivial conversion. As usual, combine multiple DEFUNs into a single DEFPY for simplicity. As a bonus of the northbound conversion, this commit fixes the redistribution of certain protocols into ripd. The 'redist_type' array used by the "redistribute" commands was terribly outdated, which was preventing the CLI to parse correctly certain protocols like isis and babel. Remove the route_map hooks installed by rip_route_map_init() since they were redundant (rip_init() already takes care of that). Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
install_element(RIP_NODE, &rip_redistribute_cmd);
ripd: retrofit the 'route' command to the new northbound model Trivial conversion. Remove the rip->route routing table and associated code because this variable was used only to show the running configuration. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
install_element(RIP_NODE, &rip_route_cmd);
ripd: retrofit the 'timer basic' command to the new northbound model Trivial conversion. Use the northbound 'apply_finish()' callback so we'll call rip_event() only once even if we change the three RIP timers at the same time. Convert the timers to uint32_t to match their representation in the YANG model. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
install_element(RIP_NODE, &rip_timers_cmd);
install_element(RIP_NODE, &no_rip_timers_cmd);
ripd: retrofit the 'version' command to the new northbound model Trivial conversion. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:01 +02:00
install_element(RIP_NODE, &rip_version_cmd);
install_element(RIP_NODE, &no_rip_version_cmd);
ripd: support BFD integration Implement RIP peer monitoring with BFD. RFC 5882 Generic Application of Bidirectional Forwarding Detection (BFD), Section 10.3 Interactions with RIP. Co-authored-by: Renato Westphal <renato@opensourcerouting.org> Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
2021-10-14 17:12:37 +02:00
install_element(RIP_NODE, &rip_bfd_default_profile_cmd);
install_element(RIP_NODE, &no_rip_bfd_default_profile_cmd);
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
install_element(INTERFACE_NODE, &ip_rip_split_horizon_cmd);
install_element(INTERFACE_NODE, &ip_rip_v2_broadcast_cmd);
install_element(INTERFACE_NODE, &ip_rip_receive_version_cmd);
install_element(INTERFACE_NODE, &no_ip_rip_receive_version_cmd);
install_element(INTERFACE_NODE, &ip_rip_send_version_cmd);
install_element(INTERFACE_NODE, &no_ip_rip_send_version_cmd);
install_element(INTERFACE_NODE, &ip_rip_authentication_mode_cmd);
install_element(INTERFACE_NODE, &no_ip_rip_authentication_mode_cmd);
install_element(INTERFACE_NODE, &ip_rip_authentication_string_cmd);
install_element(INTERFACE_NODE, &no_ip_rip_authentication_string_cmd);
install_element(INTERFACE_NODE, &ip_rip_authentication_key_chain_cmd);
install_element(INTERFACE_NODE,
&no_ip_rip_authentication_key_chain_cmd);
ripd: support BFD integration Implement RIP peer monitoring with BFD. RFC 5882 Generic Application of Bidirectional Forwarding Detection (BFD), Section 10.3 Interactions with RIP. Co-authored-by: Renato Westphal <renato@opensourcerouting.org> Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
2021-10-14 17:12:37 +02:00
install_element(INTERFACE_NODE, &ip_rip_bfd_cmd);
install_element(INTERFACE_NODE, &ip_rip_bfd_profile_cmd);
install_element(INTERFACE_NODE, &no_ip_rip_bfd_profile_cmd);
ripd: retrofit all RIP interface commands to the new northbound model Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:03 +02:00
ripd: implement the 'clear-rip-route' YANG RPC This command deletes all received routes from the RIP routing table. It should be used with caution as it can create black holes in the network until RIP reconverges. Very useful to make automated testing (e.g. ANVL) more predictable, since the internal state of ripd can be cleared after each test. Implement the command using a YANG RPC so that it can be executed by other northbound clients in addition to the CLI. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:35:04 +02:00
install_element(ENABLE_NODE, &clear_ip_rip_cmd);
yang, ripd: add 'frr-ripd.yang' and associated stub callbacks Introduce frr-ripd.yang, which defines a model for managing the FRR ripd daemon. Also add frr-route-types.yang which defines typedefs for FRR route types. Update the 'frr_yang_module_info' array of ripd with the new 'frr-ripd' module. Add two new files (rip_cli.[ch]) which should contain all ripd commands converted to the new northbound model. Centralizing all commands in a single place will facilitate the process of moving the CLI to a separate program in the future. Add automatically generated stub callbacks in rip_northbound.c. These callbacks will be implemented gradually in the following commits. Add example JSON/XML ripd configurations in yang/examples/. Add the confd.frr-ripd.yang YANG module with annotations specific to the ConfD daemon. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-05-09 06:34:57 +02:00
}
Reference in a new issue Copy permalink