Update to bgpd.conf templating (#186)

* Update bgpd.conf

* Update bgpd.conf

* Update bgpd.conf

* Update bgpd.conf

* Update bgpd.conf

* Update bgpd.conf

* Update bgpd.conf

* Update bgpd.conf

* Update bgpd.conf

* fixed problem with enable/disable items

disabling an item was not recognized by template

* Update dialogEditBGPASPath.xml

* bump to 1.3.1

small updates to templating and a typo in help which is not accepted by quagga itself

* Small typo, last one

Sorry

* Added redistribute

While chasing a bug for multiple redistributes I found that I completely forgot to add redistribution to templating. I'll use this PR since it's a small change

* Remove PIM

removed PIM as it is not valid with BGP config
This commit is contained in:
Michael
2017-06-28 14:57:02 +02:00
committed by Fabian Franz
parent 1c848ae46e
commit 92e2c6dac9
4 changed files with 11 additions and 7 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
PLUGIN_NAME= quagga
PLUGIN_VERSION= 1.3.0
PLUGIN_VERSION= 1.3.1
PLUGIN_COMMENT= Quagga Routing Suite
PLUGIN_DEPENDS= quagga ruby
PLUGIN_MAINTAINER= franz.fabian.94@gmail.com
@@ -21,6 +21,6 @@
<id>aspath.as</id>
<label>AS</label>
<type>text</type>
<help>The AS pattern you want to match, regexp allowed (e.g. *$ or _1$). It's not validated so please be careful!</help>
<help>The AS pattern you want to match, regexp allowed (e.g. .$ or _1$). It's not validated so please be careful!</help>
</field>
</form>
@@ -27,7 +27,6 @@
<connected>Connected routes (directly attached subnet or host)</connected>
<isis>Intermediate System to Intermediate System (IS-IS)</isis>
<kernel>Kernel routes (not installed via the zebra RIB)</kernel>
<pim>Protocol Independent Multicast (PIM)</pim>
<rip>Routing Information Protocol (RIP)</rip>
<static>Statically configured routes</static>
</OptionValues>
@@ -14,6 +14,11 @@ router bgp {{ OPNsense.quagga.bgp.asnumber }}
network {{ network }}
{% endfor %}
{% endif %}
{% if helpers.exists('OPNsense.quagga.bgp.redistribute') and OPNsense.quagga.bgp.redistribute != '' %}
{% for bgp_redistribute in OPNsense.quagga.bgp.redistribute.split(',') %}
redistribute {{ bgp_redistribute }}
{% endfor %}
{% endif %}
{% if helpers.exists('OPNsense.quagga.bgp.neighbors.neighbor') %}
{% for neighbor in helpers.toList('OPNsense.quagga.bgp.neighbors.neighbor') %}
{% if neighbor.enabled == '1' %}
@@ -30,7 +35,7 @@ router bgp {{ OPNsense.quagga.bgp.asnumber }}
{% if neighbor.linkedPrefixlistIn|default("") != "" %}
{% for prefixlist in neighbor.linkedPrefixlistIn.split(",") %}
{% set prefixlist2_data = helpers.getUUID(prefixlist) %}
{% if prefixlist2_data != '' %}
{% if prefixlist2_data != {} and prefixlist2_data.enabled == '1' %}
neighbor {{ neighbor.address }} prefix-list {{ prefixlist2_data.name }} in
{% endif %}
{% endfor %}
@@ -38,7 +43,7 @@ router bgp {{ OPNsense.quagga.bgp.asnumber }}
{% if neighbor.linkedPrefixlistOut|default("") != "" %}
{% for prefixlist in neighbor.linkedPrefixlistOut.split(",") %}
{% set prefixlist_data = helpers.getUUID(prefixlist) %}
{% if prefixlist_data != '' %}
{% if prefixlist_data != {} and prefixlist_data.enabled == '1' %}
neighbor {{ neighbor.address }} prefix-list {{ prefixlist_data.name }} out
{% endif %}
{% endfor %}
@@ -46,7 +51,7 @@ router bgp {{ OPNsense.quagga.bgp.asnumber }}
{% if neighbor.linkedRoutemapIn|default("") != "" %}
{% for aspath in neighbor.linkedRoutemapIn.split(",") %}
{% set routemap2_data = helpers.getUUID(aspath) %}
{% if routemap2_data != '' %}
{% if routemap2_data != {} and routemap2_data.enabled == '1' %}
neighbor {{ neighbor.address }} route-map {{ routemap2_data.name }} in
{% endif %}
{% endfor %}
@@ -54,7 +59,7 @@ router bgp {{ OPNsense.quagga.bgp.asnumber }}
{% if neighbor.linkedRoutemapOut|default("") != "" %}
{% for aspath in neighbor.linkedRoutemapOut.split(",") %}
{% set routemap_data = helpers.getUUID(aspath) %}
{% if routemap_data != '' %}
{% if routemap_data != {} and routemap_data.enabled == '1' %}
neighbor {{ neighbor.address }} route-map {{ routemap_data.name }} out
{% endif %}
{% endfor %}