diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-06-17 19:21:57 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-06-17 19:21:57 +0200 |
| commit | 635eed0452f15b18b8125e831b48582fa093c125 (patch) | |
| tree | ac78747c07fd1cc71cbcea38125263fba458afe0 /data | |
| parent | 6cfcf7a761adb3e51f9279611435a39a1424e9c9 (diff) | |
| parent | 13f0bf83f67a90e8164dec84ed0aced2440688fb (diff) | |
| download | vyos-1x-635eed0452f15b18b8125e831b48582fa093c125.tar.gz vyos-1x-635eed0452f15b18b8125e831b48582fa093c125.zip | |
Merge branch 'route-map-extcommunity' into current
* route-map-extcommunity:
policy: T3631: migrate "set extcommunity-rt|soo" to "set extcommunity rt|soo"
route-map: T3632: fix invalid validation regex for extcommunity-rt|soo
bgp: T3624: add "bandwidth" bestpath option
policy: T3624: remove duplicate CLI node for "bgp-extcommunity-rt"
policy: T3624: add extended community bandwith support to route-map
policy: T3631: migrate "set extcommunity-rt/soo" to "set extcommunity rt|soo"
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/frr/bgpd.frr.tmpl | 9 | ||||
| -rw-r--r-- | data/templates/frr/policy.frr.tmpl | 11 |
2 files changed, 13 insertions, 7 deletions
diff --git a/data/templates/frr/bgpd.frr.tmpl b/data/templates/frr/bgpd.frr.tmpl index 158da3605..c21e7f234 100644 --- a/data/templates/frr/bgpd.frr.tmpl +++ b/data/templates/frr/bgpd.frr.tmpl @@ -402,15 +402,18 @@ router bgp {{ local_as }} {{ 'vrf ' ~ vrf if vrf is defined and vrf is not none bgp always-compare-med {% endif %} {% if parameters.bestpath is defined and parameters.bestpath is not none %} -{% if parameters.bestpath.compare_routerid is defined %} - bgp bestpath compare-routerid -{% endif %} {% if parameters.bestpath.as_path is defined and parameters.bestpath.as_path is not none %} {% for option in parameters.bestpath.as_path %} {# replace is required for multipath-relax option #} bgp bestpath as-path {{ option|replace('_', '-') }} {% endfor %} {% endif %} +{% if parameters.bestpath.bandwidth is defined and parameters.bestpath.bandwidth is not none %} + bgp bestpath bandwidth {{ parameters.bestpath.bandwidth }} +{% endif %} +{% if parameters.bestpath.compare_routerid is defined %} + bgp bestpath compare-routerid +{% endif %} {% if parameters.bestpath.med is defined and parameters.bestpath.med is not none %} bgp bestpath med {{ 'confed' if parameters.bestpath.med.confed is defined }} {{ 'missing-as-worst' if parameters.bestpath.med.missing_as_worst is defined }} {% endif %} diff --git a/data/templates/frr/policy.frr.tmpl b/data/templates/frr/policy.frr.tmpl index 507ee2a14..b5649b44e 100644 --- a/data/templates/frr/policy.frr.tmpl +++ b/data/templates/frr/policy.frr.tmpl @@ -247,11 +247,14 @@ route-map {{ route_map }} {{ rule_config.action }} {{ rule }} {% if rule_config.set.distance is defined and rule_config.set.distance is not none %} set distance {{ rule_config.set.distance }} {% endif %} -{% if rule_config.set.extcommunity_rt is defined and rule_config.set.extcommunity_rt is not none %} - set extcommunity rt {{ rule_config.set.extcommunity_rt }} +{% if rule_config.set.extcommunity is defined and rule_config.set.extcommunity.bandwidth is defined and rule_config.set.extcommunity.bandwidth is not none %} + set extcommunity bandwidth {{ rule_config.set.extcommunity.bandwidth }} {% endif %} -{% if rule_config.set.extcommunity_soo is defined and rule_config.set.extcommunity_soo is not none %} - set extcommunity soo {{ rule_config.set.extcommunity_soo }} +{% if rule_config.set.extcommunity is defined and rule_config.set.extcommunity.rt is defined and rule_config.set.extcommunity.rt is not none %} + set extcommunity rt {{ rule_config.set.extcommunity.rt }} +{% endif %} +{% if rule_config.set.extcommunity is defined and rule_config.set.extcommunity.soo is defined and rule_config.set.extcommunity.soo is not none %} + set extcommunity soo {{ rule_config.set.extcommunity.soo }} {% endif %} {% if rule_config.set.ip_next_hop is defined and rule_config.set.ip_next_hop is not none %} set ip next-hop {{ rule_config.set.ip_next_hop }} |