summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-02-14 11:26:48 +0100
committerChristian Poessinger <christian@poessinger.com>2021-02-14 11:30:54 +0100
commit081b747e2940ac042e39bac1f209d7df94a413bf (patch)
treecff16023841f2d081b8fd3c7daaafed8a8ddb03e /data
parentd468102e66ff7ed784d794e6884983669bba108e (diff)
downloadvyos-1x-081b747e2940ac042e39bac1f209d7df94a413bf.tar.gz
vyos-1x-081b747e2940ac042e39bac1f209d7df94a413bf.zip
bgp: T2387: bugfix missing options not added to FRR
The following options were not represented in the Jinja2 template: - port - advertisement-interval - strict-capability-match In addition the smoketests have been extended to support IPv6 neighbors, too.
Diffstat (limited to 'data')
-rw-r--r--data/templates/frr/bgp.frr.tmpl9
1 files changed, 9 insertions, 0 deletions
diff --git a/data/templates/frr/bgp.frr.tmpl b/data/templates/frr/bgp.frr.tmpl
index 8db6015d0..62c675291 100644
--- a/data/templates/frr/bgp.frr.tmpl
+++ b/data/templates/frr/bgp.frr.tmpl
@@ -9,6 +9,9 @@
{% if config.remote_as is defined and config.remote_as is not none %}
neighbor {{ neighbor }} remote-as {{ config.remote_as }}
{% endif %}
+{% if config.advertisement_interval is defined and config.advertisement_interval is not none %}
+ neighbor {{ neighbor }} advertisement-interval {{ config.advertisement_interval }}
+{% endif %}
{% if config.bfd is defined %}
neighbor {{ neighbor }} bfd
{% endif %}
@@ -43,9 +46,15 @@
{% if config.password is defined and config.password is not none %}
neighbor {{ neighbor }} password {{ config.password }}
{% endif %}
+{% if config.port is defined and config.port is not none %}
+ neighbor {{ neighbor }} port {{ config.port }}
+{% endif %}
{% if config.shutdown is defined %}
neighbor {{ neighbor }} shutdown
{% endif %}
+{% if config.strict_capability_match is defined %}
+ neighbor {{ neighbor }} strict-capability-match
+{% endif %}
{% if config.ttl_security is defined and config.ttl_security.hops is defined and config.ttl_security.hops is not none %}
neighbor {{ neighbor }} ttl-security hops {{ config.ttl_security.hops }}
{% endif %}