upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-05-28 04:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net/frr: OSPF/OSPF6 More visibility and safety for ModelRelationField references (#5459)

Browse source 
* Allow multiple prefix list selections in a route map in OSPF6 as well

* Improve visibility for route-maps and prefix-lists in OSPF/OSPF6 and enable internalModelUseSafeDelete
This commit is contained in:
Monviech 2026-05-21 14:53:07 +02:00 committed by GitHub
parent b495e6b001
commit d3c3e79628
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 45 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/Ospf6settingsController.php
View file

@ -37,6 +37,7 @@ class Ospf6settingsController extends ApiMutableModelControllerBase
{
protected static $internalModelName = 'ospf6';
protected static $internalModelClass = '\OPNsense\Quagga\OSPF6';
protected static $internalModelUseSafeDelete = true;
public function searchNetworkAction()
{

1
net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/OspfsettingsController.php
View file

@ -36,6 +36,7 @@ class OspfsettingsController extends ApiMutableModelControllerBase
{
protected static $internalModelName = 'ospf';
protected static $internalModelClass = '\OPNsense\Quagga\OSPF';
protected static $internalModelUseSafeDelete = true;
public function searchNeighborAction()
{

4
net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPF6Network.xml
View file

@ -40,7 +40,7 @@
<id>network.linkedPrefixlistIn</id>
<label>Prefix-List In</label>
<type>dropdown</type>
<help>Filters inbound route advertisements using a prefix list.</help>
<help>Filters inbound route advertisements using a prefix list. If multiple items with the same name exist, choosing one of them will apply all items with the same name.</help>
<grid_view>
<visible>false</visible>
</grid_view>
@ -49,7 +49,7 @@
<id>network.linkedPrefixlistOut</id>
<label>Prefix-List Out</label>
<type>dropdown</type>
<help>Filters outbound route advertisements using a prefix list.</help>
<help>Filters outbound route advertisements using a prefix list. If multiple items with the same name exist, choosing one of them will apply all items with the same name.</help>
<grid_view>
<visible>false</visible>
</grid_view>

3
net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPF6RouteMaps.xml
View file

@ -31,9 +31,8 @@
<id>routemap.match2</id>
<label>Prefix List</label>
<type>select_multiple</type>
<style>tokenize</style>
<allownew>true</allownew>
<help>Allows for matching based on prefix lists, multiple selections enabled.</help>
<help>Allows for matching based on prefix lists, multiple selections enabled. If multiple items with the same name exist, choosing one of them will apply all items with the same name.</help>
</field>
<field>
<id>routemap.set</id>

4
net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFNetwork.xml
View file

@ -40,7 +40,7 @@
<id>network.linkedPrefixlistIn</id>
<label>Prefix-List In</label>
<type>dropdown</type>
<help>Filters inbound route advertisements using a prefix list.</help>
<help>Filters inbound route advertisements using a prefix list. If multiple items with the same name exist, choosing one of them will apply all items with the same name.</help>
<grid_view>
<visible>false</visible>
</grid_view>
@ -49,7 +49,7 @@
<id>network.linkedPrefixlistOut</id>
<label>Prefix-List Out</label>
<type>dropdown</type>
<help>Filters outbound route advertisements using a prefix list.</help>
<help>Filters outbound route advertisements using a prefix list. If multiple items with the same name exist, choosing one of them will apply all items with the same name.</help>
<grid_view>
<visible>false</visible>
</grid_view>

2
net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFRouteMaps.xml
View file

@ -32,7 +32,7 @@
<label>Prefix List</label>
<type>select_multiple</type>
<allownew>true</allownew>
<help>Allows for matching based on prefix lists, multiple selections enabled.</help>
<help>Allows for matching based on prefix lists, multiple selections enabled. If multiple items with the same name exist, choosing one of them will apply all items with the same name.</help>
</field>
<field>
<id>routemap.set</id>

2
net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditRedistribution.xml
View file

@ -19,7 +19,7 @@
<id>redistribution.linkedRoutemap</id>
<label>Route-Map</label>
<type>dropdown</type>
<help>Optional Route-map to apply to this redistribution.</help>
<help>Optional Route-map to apply to this redistribution. If multiple items with the same name exist, choosing one of them will apply all items with the same name.</help>
</field>
<field>
<id>redistribution.description</id>

24
net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml
View file

@ -97,23 +97,23 @@
<arearange type="NetworkField"/>
<linkedPrefixlistIn type="ModelRelationField">
<Model>
<template>
<prefixlists>
<source>OPNsense.quagga.ospf</source>
<items>prefixlists.prefixlist</items>
<display>name</display>
<group>name</group>
</template>
<display>name,seqnumber</display>
<display_format>%s:%s</display_format>
</prefixlists>
</Model>
<ValidationMessage>Related Prefix-List item not found.</ValidationMessage>
</linkedPrefixlistIn>
<linkedPrefixlistOut type="ModelRelationField">
<Model>
<template>
<prefixlists>
<source>OPNsense.quagga.ospf</source>
<items>prefixlists.prefixlist</items>
<display>name</display>
<group>name</group>
</template>
<display>name,seqnumber</display>
<display_format>%s:%s</display_format>
</prefixlists>
</Model>
<ValidationMessage>Related Prefix-List item not found.</ValidationMessage>
</linkedPrefixlistOut>
@ -308,12 +308,12 @@
</redistribute>
<linkedRoutemap type="ModelRelationField">
<Model>
<template>
<routemaps>
<source>OPNsense.quagga.ospf</source>
<items>routemaps.routemap</items>
<display>name</display>
<group>name</group>
</template>
<display>name,id</display>
<display_format>%s:%s</display_format>
</routemaps>
</Model>
<ValidationMessage>Related Route-Map item not found.</ValidationMessage>
</linkedRoutemap>

32
net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF6.xml
View file

@ -54,23 +54,23 @@
<arearange type="TextField"/>
<linkedPrefixlistIn type="ModelRelationField">
<Model>
<template>
<prefixlists>
<source>OPNsense.quagga.ospf6</source>
<items>prefixlists.prefixlist</items>
<display>name</display>
<group>name</group>
</template>
<display>name,seqnumber</display>
<display_format>%s:%s</display_format>
</prefixlists>
</Model>
<ValidationMessage>Related Prefix-List item not found.</ValidationMessage>
</linkedPrefixlistIn>
<linkedPrefixlistOut type="ModelRelationField">
<Model>
<template>
<prefixlists>
<source>OPNsense.quagga.ospf6</source>
<items>prefixlists.prefixlist</items>
<display>name</display>
<group>name</group>
</template>
<display>name,seqnumber</display>
<display_format>%s:%s</display_format>
</prefixlists>
</Model>
<ValidationMessage>Related Prefix-List item not found.</ValidationMessage>
</linkedPrefixlistOut>
@ -194,12 +194,14 @@
</id>
<match2 type="ModelRelationField">
<Model>
<template>
<prefixlists>
<source>OPNsense.quagga.ospf6</source>
<items>prefixlists.prefixlist</items>
<display>name</display>
</template>
<display>name,seqnumber</display>
<display_format>%s:%s</display_format>
</prefixlists>
</Model>
<Multiple>Y</Multiple>
<ValidationMessage>Related item not found.</ValidationMessage>
</match2>
<set type="TextField"/>
@ -225,12 +227,12 @@
</redistribute>
<linkedRoutemap type="ModelRelationField">
<Model>
<template>
<routemaps>
<source>OPNsense.quagga.ospf6</source>
<items>routemaps.routemap</items>
<display>name</display>
<group>name</group>
</template>
<display>name,id</display>
<display_format>%s:%s</display_format>
</routemaps>
</Model>
<ValidationMessage>Related Route-Map item not found.</ValidationMessage>
</linkedRoutemap>

10
net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospf6d.conf
View file

@ -80,12 +80,16 @@ ipv6 prefix-list {{ prefixlist.name }} seq {{ prefixlist.seqnumber }} {{ prefixl
{% for routemap in helpers.sortDictList(OPNsense.quagga.ospf6.routemaps.routemap, 'name', 'id' ) %}
{% if routemap.enabled == '1' %}
route-map {{ routemap.name }} {{ routemap.action }} {{ routemap.id }}
{# XXX: Multiple prefix lists that have the same name can be selected (intentionally), but each is stored as unique item. #}
{# The relationship is a bit loose, unique solves part of this issue. #}
{% if routemap.match2|default("") != "" %}
{% set prefixlist_names = [] %}
{% for prefixlist in routemap.match2.split(",") %}
{% set prefixlist_data = helpers.getUUID(prefixlist) %}
{% if 'match2' in routemap and routemap.match2 != '' %}
match ipv6 address prefix-list {{ prefixlist_data.name }}
{% endif %}
{% do prefixlist_names.append(prefixlist_data.name) %}
{% endfor %}
{% for prefixlist_name in prefixlist_names | unique %}
match ip address prefix-list {{ prefixlist_name }}
{% endfor %}
{% endif %}
{% if routemap.set|default("") != "" %}