Merge pull request #4200 from ton31337/fix/add_alias_for_force_next-hop

bgpd: Make sure `next-hop-self all` backward compatible with force
This commit is contained in:
Russ White 2019-04-25 18:22:31 -04:00 committed by GitHub
commit 8ed9a5877e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3943,6 +3943,13 @@ ALIAS_HIDDEN(neighbor_nexthop_self_force,
"Disable the next hop calculation for this neighbor\n" "Disable the next hop calculation for this neighbor\n"
"Set the next hop to self for reflected routes\n") "Set the next hop to self for reflected routes\n")
ALIAS_HIDDEN(neighbor_nexthop_self_force,
neighbor_nexthop_self_all_hidden_cmd,
"neighbor <A.B.C.D|X:X::X:X|WORD> next-hop-self all",
NEIGHBOR_STR NEIGHBOR_ADDR_STR2
"Disable the next hop calculation for this neighbor\n"
"Set the next hop to self for reflected routes\n")
DEFUN (no_neighbor_nexthop_self, DEFUN (no_neighbor_nexthop_self,
no_neighbor_nexthop_self_cmd, no_neighbor_nexthop_self_cmd,
"no neighbor <A.B.C.D|X:X::X:X|WORD> next-hop-self", "no neighbor <A.B.C.D|X:X::X:X|WORD> next-hop-self",
@ -3984,6 +3991,13 @@ ALIAS_HIDDEN(no_neighbor_nexthop_self_force,
"Disable the next hop calculation for this neighbor\n" "Disable the next hop calculation for this neighbor\n"
"Set the next hop to self for reflected routes\n") "Set the next hop to self for reflected routes\n")
ALIAS_HIDDEN(no_neighbor_nexthop_self_force,
no_neighbor_nexthop_self_all_hidden_cmd,
"no neighbor <A.B.C.D|X:X::X:X|WORD> next-hop-self all",
NO_STR NEIGHBOR_STR NEIGHBOR_ADDR_STR2
"Disable the next hop calculation for this neighbor\n"
"Set the next hop to self for reflected routes\n")
/* neighbor as-override */ /* neighbor as-override */
DEFUN (neighbor_as_override, DEFUN (neighbor_as_override,
neighbor_as_override_cmd, neighbor_as_override_cmd,
@ -13234,6 +13248,8 @@ void bgp_vty_init(void)
/* "neighbor next-hop-self force" commands. */ /* "neighbor next-hop-self force" commands. */
install_element(BGP_NODE, &neighbor_nexthop_self_force_hidden_cmd); install_element(BGP_NODE, &neighbor_nexthop_self_force_hidden_cmd);
install_element(BGP_NODE, &no_neighbor_nexthop_self_force_hidden_cmd); install_element(BGP_NODE, &no_neighbor_nexthop_self_force_hidden_cmd);
install_element(BGP_NODE, &neighbor_nexthop_self_all_hidden_cmd);
install_element(BGP_NODE, &no_neighbor_nexthop_self_all_hidden_cmd);
install_element(BGP_IPV4_NODE, &neighbor_nexthop_self_force_cmd); install_element(BGP_IPV4_NODE, &neighbor_nexthop_self_force_cmd);
install_element(BGP_IPV4_NODE, &no_neighbor_nexthop_self_force_cmd); install_element(BGP_IPV4_NODE, &no_neighbor_nexthop_self_force_cmd);
install_element(BGP_IPV4M_NODE, &neighbor_nexthop_self_force_cmd); install_element(BGP_IPV4M_NODE, &neighbor_nexthop_self_force_cmd);