net/frr: add description fields to BGP (#2054)

This commit is contained in:
Michael 2020-10-21 13:01:17 +02:00 committed by GitHub
parent 8db3b0e5ec
commit 2871ba1546
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 54 additions and 9 deletions

View file

@ -1,5 +1,5 @@
PLUGIN_NAME= frr
PLUGIN_VERSION= 1.17
PLUGIN_VERSION= 1.18
PLUGIN_COMMENT= The FRRouting Protocol Suite
PLUGIN_DEPENDS= frr7 ruby
PLUGIN_MAINTAINER= franz.fabian.94@gmail.com

View file

@ -11,6 +11,10 @@ switching and routing, Internet access routers, and Internet peering.
Plugin Changelog
================
1.18
* Add description fields to BGP tabs
1.17
* Fix templating for BGP AS-Path Lists (by Steve Buzonas)

View file

@ -44,6 +44,7 @@ class BgpController extends ApiMutableModelControllerBase
return $this->searchBase(
'neighbors.neighbor',
array("enabled",
"description",
"address",
"remoteas",
"updatesource",
@ -82,7 +83,7 @@ class BgpController extends ApiMutableModelControllerBase
{
return $this->searchBase(
'aspaths.aspath',
array("enabled", "number", "action", "as" )
array("enabled", "description", "number", "action", "as" )
);
}
@ -111,7 +112,7 @@ class BgpController extends ApiMutableModelControllerBase
{
return $this->searchBase(
'prefixlists.prefixlist',
array("enabled", "name", "seqnumber", "action", "network" )
array("enabled", "description", "name", "seqnumber", "action", "network" )
);
}
public function getPrefixlistAction($uuid = null)
@ -139,7 +140,7 @@ class BgpController extends ApiMutableModelControllerBase
{
return $this->searchBase(
'routemaps.routemap',
array("enabled", "name", "action", "id", "match", "match2", "set")
array("enabled", "description", "name", "action", "id", "match", "match2", "set")
);
}

View file

@ -5,6 +5,12 @@
<type>checkbox</type>
<help>Enable / Disable</help>
</field>
<field>
<id>aspath.description</id>
<label>Description</label>
<type>text</type>
<help>Add an optional description for this AS-Path list.</help>
</field>
<field>
<id>aspath.number</id>
<label>Number</label>

View file

@ -4,6 +4,12 @@
<label>Enabled</label>
<type>checkbox</type>
</field>
<field>
<id>neighbor.description</id>
<label>Description</label>
<type>text</type>
<help>Set an optional description for this neighbor.</help>
</field>
<field>
<id>neighbor.address</id>
<label>Peer-IP</label>

View file

@ -4,6 +4,12 @@
<label>Enabled</label>
<type>checkbox</type>
<help>Enable / Disable</help>
</field>
<field>
<id>prefixlist.description</id>
<label>Description</label>
<type>text</type>
<help>Add an optional description for this Prefix-List.</help>
</field>
<field>
<id>prefixlist.name</id>

View file

@ -5,6 +5,12 @@
<type>checkbox</type>
<help>Enable / Disable</help>
</field>
<field>
<id>routemap.description</id>
<label>Description</label>
<type>text</type>
<help>Add an optional description for this route-map.</help>
</field>
<field>
<id>routemap.name</id>
<label>Name</label>

View file

@ -1,7 +1,7 @@
<model>
<mount>//OPNsense/quagga/bgp</mount>
<description>BGP Routing configuration</description>
<version>1.0.3</version>
<version>1.0.4</version>
<items>
<enabled type="BooleanField">
<default>0</default>
@ -39,6 +39,10 @@
<default>1</default>
<Required>Y</Required>
</enabled>
<description type="TextField">
<default></default>
<Required>N</Required>
</description>
<address type="NetworkField">
<default></default>
<Required>Y</Required>
@ -130,6 +134,10 @@
<default>1</default>
<Required>Y</Required>
</enabled>
<description type="TextField">
<default></default>
<Required>N</Required>
</description>
<number type="IntegerField">
<default></default>
<Required>Y</Required>
@ -156,6 +164,10 @@
<default>1</default>
<Required>Y</Required>
</enabled>
<description type="TextField">
<default></default>
<Required>N</Required>
</description>
<name type="TextField">
<default></default>
<Required>Y</Required>
@ -196,6 +208,10 @@
<default>1</default>
<Required>Y</Required>
</enabled>
<description type="TextField">
<default></default>
<Required>N</Required>
</description>
<name type="TextField">
<default></default>
<Required>Y</Required>

View file

@ -50,12 +50,9 @@ POSSIBILITY OF SUCH DAMAGE.
<thead>
<tr>
<th data-column-id="enabled" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
<th data-column-id="description" data-type="string" data-visible="true">{{ lang._('Description') }}</th>
<th data-column-id="address" data-type="string" data-visible="true">{{ lang._('Neighbor Address') }}</th>
<th data-column-id="remoteas" data-type="string" data-visible="true">{{ lang._('Remote AS') }}</th>
<th data-column-id="updatesource" data-type="string" data-visible="true">{{ lang._('Update Source Address') }}</th>
<th data-column-id="nexthopself" data-type="string" data-formatter="rowtoggle">{{ lang._('Next Hop Self') }}</th>
<th data-column-id="multihop" data-type="string" data-formatter="rowtoggle">{{ lang._('Multi Hop') }}</th>
<th data-column-id="defaultoriginate" data-type="string" data-formatter="rowtoggle">{{ lang._('Default Originate') }}</th>
<th data-column-id="linkedPrefixlistIn" data-type="string" data-visible="true">{{ lang._('Prefix List inbound') }}</th>
<th data-column-id="linkedPrefixlistOut" data-type="string" data-visible="true">{{ lang._('Prefix List outbound') }}</th>
<th data-column-id="linkedRoutemapIn" data-type="string" data-visible="true">{{ lang._('Route Map inbound') }}</th>
@ -83,6 +80,7 @@ POSSIBILITY OF SUCH DAMAGE.
<thead>
<tr>
<th data-column-id="enabled" data-type="string" data-formatter="rowtoggle" data-sortable="false">{{ lang._('Enabled') }}</th>
<th data-column-id="description" data-type="string" data-visible="true">{{ lang._('Description') }}</th>
<th data-column-id="number" data-type="string" data-visible="true" data-sortable="true">{{ lang._('Number') }}</th>
<th data-column-id="action" data-type="string" data-visible="true" data-sortable="false">{{ lang._('Action') }}</th>
<th data-column-id="as" data-type="string" data-visible="true" data-sortable="false">{{ lang._('AS Number') }}</th>
@ -110,6 +108,7 @@ POSSIBILITY OF SUCH DAMAGE.
<tr>
<th data-column-id="enabled" data-type="string" data-formatter="rowtoggle" data-sortable="false">{{ lang._('Enabled') }}</th>
<th data-column-id="name" data-type="string" data-visible="true" data-sortable="true">{{ lang._('Name') }}</th>
<th data-column-id="description" data-type="string" data-visible="true">{{ lang._('Description') }}</th>
<th data-column-id="seqnumber" data-type="string" data-visible="true" data-sortable="true">{{ lang._('Secquence Number') }}</th>
<th data-column-id="action" data-type="string" data-visible="true" data-sortable="false">{{ lang._('Action') }}</th>
<th data-column-id="network" data-type="string" data-visible="true" data-sortable="false">{{ lang._('Network') }}</th>
@ -137,6 +136,7 @@ POSSIBILITY OF SUCH DAMAGE.
<tr>
<th data-column-id="enabled" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
<th data-column-id="name" data-type="string" data-visible="true">{{ lang._('Name') }}</th>
<th data-column-id="description" data-type="string" data-visible="true">{{ lang._('Description') }}</th>
<th data-column-id="action" data-type="string" data-visible="true">{{ lang._('Action') }}</th>
<th data-column-id="id" data-type="string" data-visible="true">{{ lang._('ID') }}</th>
<th data-column-id="match" data-type="string" data-visible="true">{{ lang._('AS Path List') }}</th>