summaryrefslogtreecommitdiffstats
path: root/zebra
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2016-11-18 19:51:33 +0100
committerDonald Sharp <sharpd@cumulusnetworks.com>2016-11-18 19:51:33 +0100
commit80922366a0642e5e24a653cacd03e6023a188049 (patch)
treea883439a13ee5242d1234f1e453b8d7cb9b0bb56 /zebra
parent*: Fix up licensing to be right (diff)
parentzebra: fix link-params CLI handling (diff)
downloadfrr-80922366a0642e5e24a653cacd03e6023a188049.tar.xz
frr-80922366a0642e5e24a653cacd03e6023a188049.zip
Merge remote-tracking branch 'opensourcerouting/cmaster-next-linkpar' into cmaster-next
Diffstat (limited to 'zebra')
-rw-r--r--zebra/interface.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/zebra/interface.c b/zebra/interface.c
index 0f4d2ee9e..31955b1fc 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -2814,6 +2814,7 @@ link_params_config_write (struct vty *vty, struct interface *ifp)
if (IS_PARAM_SET(iflp, LP_RMT_AS))
vty_out(vty, " neighbor %s as %u%s", inet_ntoa(iflp->rmt_ip),
iflp->rmt_as, VTY_NEWLINE);
+ vty_out(vty, " exit%s", VTY_NEWLINE);
return 0;
}
@@ -2978,15 +2979,22 @@ zebra_if_init (void)
install_element(LINK_PARAMS_NODE, &link_params_max_rsv_bw_cmd);
install_element(LINK_PARAMS_NODE, &link_params_unrsv_bw_cmd);
install_element(LINK_PARAMS_NODE, &link_params_admin_grp_cmd);
+ install_element(LINK_PARAMS_NODE, &no_link_params_admin_grp_cmd);
install_element(LINK_PARAMS_NODE, &link_params_inter_as_cmd);
install_element(LINK_PARAMS_NODE, &no_link_params_inter_as_cmd);
install_element(LINK_PARAMS_NODE, &link_params_delay_cmd);
+ install_element(LINK_PARAMS_NODE, &no_link_params_delay_cmd);
install_element(LINK_PARAMS_NODE, &link_params_delay_mm_cmd);
install_element(LINK_PARAMS_NODE, &link_params_delay_var_cmd);
+ install_element(LINK_PARAMS_NODE, &no_link_params_delay_var_cmd);
install_element(LINK_PARAMS_NODE, &link_params_pkt_loss_cmd);
+ install_element(LINK_PARAMS_NODE, &no_link_params_pkt_loss_cmd);
install_element(LINK_PARAMS_NODE, &link_params_ava_bw_cmd);
+ install_element(LINK_PARAMS_NODE, &no_link_params_ava_bw_cmd);
install_element(LINK_PARAMS_NODE, &link_params_res_bw_cmd);
+ install_element(LINK_PARAMS_NODE, &no_link_params_res_bw_cmd);
install_element(LINK_PARAMS_NODE, &link_params_use_bw_cmd);
+ install_element(LINK_PARAMS_NODE, &no_link_params_use_bw_cmd);
install_element (CONFIG_NODE, &zebra_vrf_cmd);
install_element (CONFIG_NODE, &no_vrf_cmd);