Skip to content

Commit 1e86ed3

Browse files
committed
net/frr: bgp.volt - Integrate layout_partials/base_bootgrid_table
1 parent 924723f commit 1e86ed3

File tree

8 files changed

+171
-173
lines changed

8 files changed

+171
-173
lines changed

net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/BgpController.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,25 @@ class BgpController extends \OPNsense\Base\IndexController
3333
public function indexAction()
3434
{
3535
$this->view->bgpForm = $this->getForm("bgp");
36+
3637
$this->view->formDialogEditBGPNeighbor = $this->getForm("dialogEditBGPNeighbor");
38+
$this->view->formGridEditBGPNeighbor = $this->getFormGrid("dialogEditBGPNeighbor", null, "BGPChangeMessage");
39+
3740
$this->view->formDialogEditBGPASPaths = $this->getForm("dialogEditBGPASPath");
41+
$this->view->formGridEditBGPASPaths = $this->getFormGrid("dialogEditBGPASPath", null, "BGPChangeMessage");
42+
3843
$this->view->formDialogEditBGPPrefixLists = $this->getForm("dialogEditBGPPrefixLists");
44+
$this->view->formGridEditBGPPrefixLists = $this->getFormGrid("dialogEditBGPPrefixLists", null, "BGPChangeMessage");
45+
3946
$this->view->formDialogEditBGPCommunityLists = $this->getForm("dialogEditBGPCommunityLists");
47+
$this->view->formGridEditBGPCommunityLists = $this->getFormGrid("dialogEditBGPCommunityLists", null, "BGPChangeMessage");
48+
4049
$this->view->formDialogEditBGPRouteMaps = $this->getForm("dialogEditBGPRouteMaps");
50+
$this->view->formGridEditBGPRouteMaps = $this->getFormGrid("dialogEditBGPRouteMaps", null, "BGPChangeMessage");
51+
4152
$this->view->formDialogEditBGPPeergroups = $this->getForm("dialogEditBGPPeergroups");
53+
$this->view->formGridEditBGPPeergroups = $this->getFormGrid("dialogEditBGPPeergroups", null, "BGPChangeMessage");
54+
4255
$this->view->pick('OPNsense/Quagga/bgp');
4356
}
4457
}

net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPASPath.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
<label>Enabled</label>
55
<type>checkbox</type>
66
<help>If this AS-Path list should be enabled.</help>
7+
<grid_view>
8+
<width>6em</width>
9+
<type>boolean</type>
10+
<formatter>rowtoggle</formatter>
11+
</grid_view>
712
</field>
813
<field>
914
<id>aspath.description</id>

net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPCommunityLists.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
<label>Enabled</label>
55
<type>checkbox</type>
66
<help>Enable / Disable</help>
7+
<grid_view>
8+
<width>6em</width>
9+
<type>boolean</type>
10+
<formatter>rowtoggle</formatter>
11+
</grid_view>
712
</field>
813
<field>
914
<id>communitylist.description</id>

net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPNeighbor.xml

Lines changed: 86 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
<id>neighbor.enabled</id>
44
<label>Enabled</label>
55
<type>checkbox</type>
6+
<grid_view>
7+
<width>6em</width>
8+
<type>boolean</type>
9+
<formatter>rowtoggle</formatter>
10+
</grid_view>
611
</field>
712
<field>
813
<id>neighbor.description</id>
@@ -28,44 +33,69 @@
2833
<type>text</type>
2934
<advanced>true</advanced>
3035
<help>Set a password for BGP authentication.</help>
36+
<grid_view>
37+
<visible>false</visible>
38+
</grid_view>
3139
</field>
3240
<field>
3341
<id>neighbor.weight</id>
3442
<label>Weight</label>
3543
<type>text</type>
3644
<advanced>true</advanced>
3745
<help>Specify a default weight value for the neighbor’s routes.</help>
46+
<grid_view>
47+
<visible>false</visible>
48+
</grid_view>
3849
</field>
3950
<field>
4051
<id>neighbor.localip</id>
4152
<label>Local Initiater IP</label>
4253
<type>text</type>
4354
<advanced>true</advanced>
4455
<help>Set the local IP connecting to the neighbor. This is only required for BGP authentication.</help>
56+
<grid_view>
57+
<visible>false</visible>
58+
</grid_view>
4559
</field>
4660
<field>
4761
<id>neighbor.updatesource</id>
4862
<label>Update-Source Interface</label>
4963
<type>dropdown</type>
5064
<help><![CDATA[Physical name of the IPv4 interface facing the peer. Please refer to the <a href="http://docs.frrouting.org/en/stable-7.4/bgp.html#clicmd-[no]neighborPEERupdate-source%3CIFNAME|ADDRESS%3E">FRR documentation</a> for more information.]]></help>
65+
<grid_view>
66+
<visible>false</visible>
67+
</grid_view>
5168
</field>
5269
<field>
5370
<id>neighbor.linklocalinterface</id>
5471
<label>IPv6 link-local interface</label>
5572
<type>dropdown</type>
5673
<advanced>true</advanced>
5774
<help><![CDATA[Interface to use for IPv6 link-local neighbours. Please refer to the <a href="http://docs.frrouting.org/en/stable-7.4/bgp.html#clicmd-[no]neighborPEERinterfaceIFNAME">FRR documentation</a> for more information.]]></help>
75+
<grid_view>
76+
<visible>false</visible>
77+
</grid_view>
5878
</field>
5979
<field>
6080
<id>neighbor.nexthopself</id>
6181
<label>Next-Hop-Self</label>
6282
<type>checkbox</type>
83+
<grid_view>
84+
<type>boolean</type>
85+
<formatter>boolean</formatter>
86+
<visible>false</visible>
87+
</grid_view>
6388
</field>
6489
<field>
6590
<id>neighbor.nexthopselfall</id>
6691
<label>Next-Hop-Self All</label>
6792
<type>checkbox</type>
6893
<help>Add the parameter "all" after next-hop-self command.</help>
94+
<grid_view>
95+
<type>boolean</type>
96+
<formatter>boolean</formatter>
97+
<visible>false</visible>
98+
</grid_view>
6999
</field>
70100
<field>
71101
<id>neighbor.multihop</id>
@@ -75,76 +105,128 @@
75105
When the neighbor is not directly connected and this knob is not enabled, the session will not establish.
76106
</help>
77107
<type>checkbox</type>
108+
<grid_view>
109+
<type>boolean</type>
110+
<formatter>boolean</formatter>
111+
<visible>false</visible>
112+
</grid_view>
78113
</field>
79114
<field>
80115
<id>neighbor.multiprotocol</id>
81116
<label>Multi-Protocol</label>
82117
<type>checkbox</type>
83118
<advanced>true</advanced>
84119
<help><![CDATA[Is this neighbour multiprotocol capable per <a href="https://datatracker.ietf.org/doc/html/rfc2283.html">RFC 2283</a>]]></help>
120+
<grid_view>
121+
<type>boolean</type>
122+
<formatter>boolean</formatter>
123+
<visible>false</visible>
124+
</grid_view>
85125
</field>
86126
<field>
87127
<id>neighbor.rrclient</id>
88128
<label>Route Reflector Client</label>
89129
<type>checkbox</type>
130+
<grid_view>
131+
<type>boolean</type>
132+
<formatter>boolean</formatter>
133+
<visible>false</visible>
134+
</grid_view>
90135
</field>
91136
<field>
92137
<id>neighbor.soft_reconfiguration_inbound</id>
93138
<label>Soft reconfiguration inbound</label>
94139
<type>checkbox</type>
95140
<help>This option allows changing policies without clearing the BGP session.</help>
141+
<grid_view>
142+
<type>boolean</type>
143+
<formatter>boolean</formatter>
144+
<visible>false</visible>
145+
</grid_view>
96146
</field>
97147
<field>
98148
<id>neighbor.bfd</id>
99149
<label>BFD</label>
100150
<type>checkbox</type>
101151
<help>You can enable BFD support for this neighbor.</help>
152+
<grid_view>
153+
<type>boolean</type>
154+
<formatter>boolean</formatter>
155+
<visible>false</visible>
156+
</grid_view>
102157
</field>
103158
<field>
104159
<id>neighbor.keepalive</id>
105160
<label>Keepalive</label>
106161
<type>text</type>
107162
<advanced>true</advanced>
108163
<help>Keepalive timer to check if the neighbor is still up. Default when unset is 60 seconds.</help>
164+
<grid_view>
165+
<visible>false</visible>
166+
</grid_view>
109167
</field>
110168
<field>
111169
<id>neighbor.holddown</id>
112170
<label>Hold Down Time</label>
113171
<type>text</type>
114172
<advanced>true</advanced>
115173
<help>The time in seconds when a neighbor is considered dead. This is usually 3 times the keeplive timer and when unset 180 seconds.</help>
174+
<grid_view>
175+
<visible>false</visible>
176+
</grid_view>
116177
</field>
117178
<field>
118179
<id>neighbor.connecttimer</id>
119180
<label>Connect Timer</label>
120181
<type>text</type>
121182
<advanced>true</advanced>
122183
<help>The time in seconds how fast a neighbor tries to reconnect.</help>
184+
<grid_view>
185+
<visible>false</visible>
186+
</grid_view>
123187
</field>
124188
<field>
125189
<id>neighbor.defaultoriginate</id>
126190
<label>Send Defaultroute</label>
127191
<type>checkbox</type>
192+
<grid_view>
193+
<type>boolean</type>
194+
<formatter>boolean</formatter>
195+
<visible>false</visible>
196+
</grid_view>
128197
</field>
129198
<field>
130199
<id>neighbor.asoverride</id>
131200
<label>Enable AS-Override</label>
132201
<type>checkbox</type>
133202
<help>Override AS number of the originating router with the local AS number. This command is only allowed for eBGP peers.</help>
203+
<grid_view>
204+
<type>boolean</type>
205+
<formatter>boolean</formatter>
206+
<visible>false</visible>
207+
</grid_view>
134208
</field>
135209
<field>
136210
<id>neighbor.disable_connected_check</id>
137211
<label>Disable Connected Check</label>
138212
<type>checkbox</type>
139213
<help>Allow peerings between directly connected eBGP peers using loopback addresses.</help>
214+
<grid_view>
215+
<type>boolean</type>
216+
<formatter>boolean</formatter>
217+
<visible>false</visible>
218+
</grid_view>
140219
</field>
141220
<field>
142221
<id>neighbor.attributeunchanged</id>
143222
<label>Attribute Unchanged</label>
144223
<type>dropdown</type>
145224
<advanced>true</advanced>
146225
<help><![CDATA[This specifies attributes to be left unchanged when sending advertisements to a peer. Read more at <a href="https://docs.frrouting.org/en/latest/bgp.html#clicmd-neighbor-PEER-attribute-unchanged-as-path-next-hop-med">FRR documentation</a>.]]></help>
147-
</field>
226+
<grid_view>
227+
<visible>false</visible>
228+
</grid_view>
229+
</field>
148230
<field>
149231
<id>neighbor.linkedPrefixlistIn</id>
150232
<label>Prefix-List In</label>
@@ -174,5 +256,8 @@
174256
<label>Peer Group</label>
175257
<type>dropdown</type>
176258
<help>Peer Group this neighbor belongs to.</help>
259+
<grid_view>
260+
<visible>false</visible>
261+
</grid_view>
177262
</field>
178263
</form>

net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPPeergroups.xml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
<id>peergroup.enabled</id>
44
<label>Enabled</label>
55
<type>checkbox</type>
6+
<grid_view>
7+
<width>6em</width>
8+
<type>boolean</type>
9+
<formatter>rowtoggle</formatter>
10+
</grid_view>
611
</field>
712
<field>
813
<id>peergroup.name</id>
@@ -14,23 +19,37 @@
1419
<id>peergroup.remoteas</id>
1520
<label>Remote AS</label>
1621
<type>text</type>
17-
<help>Remote AS for tthis peergroup.</help>
22+
<help>Remote AS for this peergroup.</help>
23+
<grid_view>
24+
<visible>false</visible>
25+
</grid_view>
1826
</field>
1927
<field>
2028
<id>peergroup.updatesource</id>
2129
<label>Update-Source Interface</label>
2230
<type>dropdown</type>
2331
<help><![CDATA[Physical name of the IPv4 interface facing the peer. Please refer to the <a href="http://docs.frrouting.org/en/stable-7.4/bgp.html#clicmd-[no]neighborPEERupdate-source%3CIFNAME|ADDRESS%3E">FRR documentation</a> for more information.]]></help>
32+
<grid_view>
33+
<visible>false</visible>
34+
</grid_view>
2435
</field>
2536
<field>
2637
<id>peergroup.nexthopself</id>
2738
<label>Next-Hop-Self</label>
2839
<type>checkbox</type>
40+
<grid_view>
41+
<type>boolean</type>
42+
<formatter>boolean</formatter>
43+
</grid_view>
2944
</field>
3045
<field>
3146
<id>peergroup.defaultoriginate</id>
3247
<label>Send Defaultroute</label>
3348
<type>checkbox</type>
49+
<grid_view>
50+
<type>boolean</type>
51+
<formatter>boolean</formatter>
52+
</grid_view>
3453
</field>
3554
<field>
3655
<id>peergroup.linkedPrefixlistIn</id>

net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPPrefixLists.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
<label>Enabled</label>
55
<type>checkbox</type>
66
<help>If this Prefix-List should be enabled.</help>
7+
<grid_view>
8+
<width>6em</width>
9+
<type>boolean</type>
10+
<formatter>rowtoggle</formatter>
11+
</grid_view>
712
</field>
813
<field>
914
<id>prefixlist.description</id>
@@ -22,6 +27,9 @@
2227
<label>IP Version</label>
2328
<type>dropdown</type>
2429
<help>Set the IP version to use.</help>
30+
<grid_view>
31+
<visible>false</visible>
32+
</grid_view>
2533
</field>
2634
<field>
2735
<id>prefixlist.seqnumber</id>

net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPRouteMaps.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
<label>Enabled</label>
55
<type>checkbox</type>
66
<help>Enable / Disable</help>
7+
<grid_view>
8+
<width>6em</width>
9+
<type>boolean</type>
10+
<formatter>rowtoggle</formatter>
11+
</grid_view>
712
</field>
813
<field>
914
<id>routemap.description</id>

0 commit comments

Comments
 (0)