diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-03-12 09:09:09 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2022-03-12 09:09:09 +0100 |
| commit | 56febd155792b579d88281940acc97f95a10a712 (patch) | |
| tree | 69c9ece4d60db7d5532dc9aa631c9addc2422fbc | |
| parent | 1e17d1d45a0952bab53af46d6c4dfe15ebb1110e (diff) | |
| parent | 7549c847c3df9155c4315efcccfaf798af9fb402 (diff) | |
| download | vyos-1x-56febd155792b579d88281940acc97f95a10a712.tar.gz vyos-1x-56febd155792b579d88281940acc97f95a10a712.zip | |
Merge branch 'T2493-nexthop-unchanged' of https://github.com/plett/vyos-1x into current
* 'T2493-nexthop-unchanged' of https://github.com/plett/vyos-1x:
policy: T2493 ip-next-hop unchanged & peer-address
| -rw-r--r-- | data/templates/frr/policy.frr.tmpl | 3 | ||||
| -rw-r--r-- | interface-definitions/policy.xml.in | 16 |
2 files changed, 19 insertions, 0 deletions
diff --git a/data/templates/frr/policy.frr.tmpl b/data/templates/frr/policy.frr.tmpl index d3d3957a5..97eb15331 100644 --- a/data/templates/frr/policy.frr.tmpl +++ b/data/templates/frr/policy.frr.tmpl @@ -276,6 +276,9 @@ route-map {{ route_map }} {{ rule_config.action }} {{ rule }} {% if rule_config.set.ipv6_next_hop is defined and rule_config.set.ipv6_next_hop.local is defined and rule_config.set.ipv6_next_hop.local is not none %} set ipv6 next-hop local {{ rule_config.set.ipv6_next_hop.local }} {% endif %} +{% if rule_config.set.ipv6_next_hop is defined and rule_config.set.ipv6_next_hop.peer_address is defined %} + set ipv6 next-hop peer-address +{% endif %} {% if rule_config.set.ipv6_next_hop is defined and rule_config.set.ipv6_next_hop.prefer_global is defined %} set ipv6 next-hop prefer-global {% endif %} diff --git a/interface-definitions/policy.xml.in b/interface-definitions/policy.xml.in index 9767285dd..5e037b558 100644 --- a/interface-definitions/policy.xml.in +++ b/interface-definitions/policy.xml.in @@ -1115,13 +1115,23 @@ <help>Nexthop IP address</help> <completionHelp> <script>${vyos_completion_dir}/list_local_ips.sh --ipv4</script> + <list>unchanged peer-address</list> </completionHelp> <valueHelp> <format>ipv4</format> <description>IP address</description> </valueHelp> + <valueHelp> + <format>unchanged</format> + <description>Set the BGP nexthop address as unchanged</description> + </valueHelp> + <valueHelp> + <format>peer-address</format> + <description>Set the BGP nexthop address to the address of the peer</description> + </valueHelp> <constraint> <validator name="ipv4-address"/> + <regex>^(unchanged|peer-address)$</regex> </constraint> </properties> </leafNode> @@ -1160,6 +1170,12 @@ </constraint> </properties> </leafNode> + <leafNode name="peer-address"> + <properties> + <help>Use peer address (for BGP only)</help> + <valueless/> + </properties> + </leafNode> <leafNode name="prefer-global"> <properties> <help>Prefer global address as the nexthop</help> |