matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

build: remove mgmtd exception from xref2vtysh

Browse source 
We may actually need to send CLI commands to mgmtd and another daemon at
the same time, for example, if this daemon is not mgmtd-converted. The
only daemon this exception protects is staticd. But we don't actually
need any configuration commands in staticd, so just remove the exception
and don't install unnecessary commands to staticd.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2024-01-27 06:20:22 +02:00
parent 05948a4d98
commit 42d6b864cd
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
python/xref2vtysh.py
View file

@ -324,17 +324,7 @@ class CommandEntry:
def load(cls, xref):
nodes = NodeDict()
mgmtname = "mgmtd/libmgmt_be_nb.la"
for cmd_name, origins in xref.get("cli", {}).items():
# If mgmtd has a yang version of a CLI command, make it the only daemon
# to handle it. For now, daemons can still be compiling their cmds into the
# binaries to allow for running standalone with CLI config files. When they
# do this they will also be present in the xref file, but we want to ignore
# those in vtysh.
if "yang" in origins.get(mgmtname, {}).get("attrs", []):
CommandEntry.process(nodes, cmd_name, mgmtname, origins[mgmtname])
continue
for origin, spec in origins.items():
CommandEntry.process(nodes, cmd_name, origin, spec)
return nodes

4
staticd/static_vty.c
View file

@ -1696,8 +1696,7 @@ void static_vty_init(void)
install_element(CONFIG_NODE, &debug_staticd_cmd);
install_element(ENABLE_NODE, &show_debugging_static_cmd);
install_element(ENABLE_NODE, &staticd_show_bfd_routes_cmd);
#endif /* ifndef INCLUDE_MGMTD_CMDDEFS_ONLY */
#else /* else INCLUDE_MGMTD_CMDDEFS_ONLY */
install_element(CONFIG_NODE, &ip_mroute_dist_cmd);
install_element(CONFIG_NODE, &ip_route_blackhole_cmd);
@ -1713,6 +1712,7 @@ void static_vty_init(void)
install_element(VRF_NODE, &ipv6_route_address_interface_vrf_cmd);
install_element(CONFIG_NODE, &ipv6_route_cmd);
install_element(VRF_NODE, &ipv6_route_vrf_cmd);
#endif /* ifndef INCLUDE_MGMTD_CMDDEFS_ONLY */
#ifndef INCLUDE_MGMTD_CMDDEFS_ONLY
mgmt_be_client_lib_vty_init();