summaryrefslogtreecommitdiff
path: root/interface-definitions/include
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2024-03-02 16:51:00 +0100
committerGitHub <noreply@github.com>2024-03-02 16:51:00 +0100
commitae65ac2eaac23a9fbca51701f53c5fe2d4e337eb (patch)
tree84b67552e892157b56d1e29534b3202b9c8bc481 /interface-definitions/include
parenta2356f7418d4ba27b0cd08a7506d672514729f3a (diff)
parent1ddb50159209cbfbff49b8bd4a9f81557bf08116 (diff)
downloadvyos-1x-ae65ac2eaac23a9fbca51701f53c5fe2d4e337eb.tar.gz
vyos-1x-ae65ac2eaac23a9fbca51701f53c5fe2d4e337eb.zip
Merge pull request #3076 from vyos/mergify/bp/sagitta/pr-3073
ospfv3: allow metric and metric-type on redistributed routes (backport #3073)
Diffstat (limited to 'interface-definitions/include')
-rw-r--r--interface-definitions/include/ospfv3/protocol-common-config.xml.i28
1 files changed, 20 insertions, 8 deletions
diff --git a/interface-definitions/include/ospfv3/protocol-common-config.xml.i b/interface-definitions/include/ospfv3/protocol-common-config.xml.i
index 4c3ca68e1..1462b9c15 100644
--- a/interface-definitions/include/ospfv3/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospfv3/protocol-common-config.xml.i
@@ -221,11 +221,23 @@
<help>Redistribute information from another routing protocol</help>
</properties>
<children>
+ <node name="babel">
+ <properties>
+ <help>Redistribute Babel routes</help>
+ </properties>
+ <children>
+ #include <include/ospf/metric.xml.i>
+ #include <include/ospf/metric-type.xml.i>
+ #include <include/route-map.xml.i>
+ </children>
+ </node>
<node name="bgp">
<properties>
<help>Redistribute BGP routes</help>
</properties>
<children>
+ #include <include/ospf/metric.xml.i>
+ #include <include/ospf/metric-type.xml.i>
#include <include/route-map.xml.i>
</children>
</node>
@@ -234,6 +246,8 @@
<help>Redistribute connected routes</help>
</properties>
<children>
+ #include <include/ospf/metric.xml.i>
+ #include <include/ospf/metric-type.xml.i>
#include <include/route-map.xml.i>
</children>
</node>
@@ -242,6 +256,8 @@
<help>Redistribute kernel routes</help>
</properties>
<children>
+ #include <include/ospf/metric.xml.i>
+ #include <include/ospf/metric-type.xml.i>
#include <include/route-map.xml.i>
</children>
</node>
@@ -250,14 +266,8 @@
<help>Redistribute RIPNG routes</help>
</properties>
<children>
- #include <include/route-map.xml.i>
- </children>
- </node>
- <node name="babel">
- <properties>
- <help>Redistribute Babel routes</help>
- </properties>
- <children>
+ #include <include/ospf/metric.xml.i>
+ #include <include/ospf/metric-type.xml.i>
#include <include/route-map.xml.i>
</children>
</node>
@@ -266,6 +276,8 @@
<help>Redistribute static routes</help>
</properties>
<children>
+ #include <include/ospf/metric.xml.i>
+ #include <include/ospf/metric-type.xml.i>
#include <include/route-map.xml.i>
</children>
</node>