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 --- ospf6d/ospf6_interface.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'ospf6d/ospf6_interface.c') diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index ae9f13bc10..0d9f15d08f 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -2522,11 +2522,7 @@ static int config_write_ospf6_interface(struct vty *vty, struct vrf *vrf) if (oi == NULL) continue; - if (vrf->vrf_id == VRF_DEFAULT) - vty_frame(vty, "interface %s\n", oi->interface->name); - else - vty_frame(vty, "interface %s vrf %s\n", - oi->interface->name, vrf->name); + if_vty_config_start(vty, ifp); if (ifp->desc) vty_out(vty, " description %s\n", ifp->desc); @@ -2581,7 +2577,7 @@ static int config_write_ospf6_interface(struct vty *vty, struct vrf *vrf) ospf6_bfd_write_config(vty, oi); - vty_endframe(vty, "exit\n!\n"); + if_vty_config_end(vty); } return 0; } -- cgit v1.2.3