From 788a036fdb57d733371b180d1d295ce6ca72bf5d Mon Sep 17 00:00:00 2001 From: Igor Ryzhov Date: Mon, 24 Jan 2022 00:07:20 +0300 Subject: *: do not print vrf name for interface config when using vrf-lite VRF name should not be printed in the config since 574445ec. The update was done for NB config output but I missed it for regular vty output. Signed-off-by: Igor Ryzhov --- zebra/interface.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'zebra/interface.c') diff --git a/zebra/interface.c b/zebra/interface.c index 534953d903..e4e80ec4e9 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -4213,11 +4213,7 @@ static int if_config_write(struct vty *vty) if_data = ifp->info; - if (ifp->vrf->vrf_id == VRF_DEFAULT) - vty_frame(vty, "interface %s\n", ifp->name); - else - vty_frame(vty, "interface %s vrf %s\n", - ifp->name, vrf->name); + if_vty_config_start(vty, ifp); if (if_data) { if (if_data->shutdown == IF_ZEBRA_SHUTDOWN_ON) @@ -4283,7 +4279,7 @@ static int if_config_write(struct vty *vty) zebra_evpn_mh_if_write(vty, ifp); link_params_config_write(vty, ifp); - vty_endframe(vty, "exit\n!\n"); + if_vty_config_end(vty); } return 0; } -- cgit v1.2.3