summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-09-30 08:34:00 +0200
committerGitHub <noreply@github.com>2023-09-30 08:34:00 +0200
commit179703886441ef5508a63ba6d9d4c11b050d3ff8 (patch)
treee237614e3b17dd11e3656fabc63575e6320eba25 /interface-definitions
parent6a9aa992ea49d6f8a2a088cff5a36283e0cca9a8 (diff)
parent9f7a5f79200782f7849cab72f55a39dedf45f214 (diff)
downloadvyos-1x-179703886441ef5508a63ba6d9d4c11b050d3ff8.tar.gz
vyos-1x-179703886441ef5508a63ba6d9d4c11b050d3ff8.zip
Merge pull request #2325 from sever-sever/T5165
T5165: Migrate policy local-route rule x destination to address
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/include/policy/local-route_rule_ipv4_address.xml.i20
-rw-r--r--interface-definitions/include/policy/local-route_rule_ipv6_address.xml.i20
-rw-r--r--interface-definitions/include/version/policy-version.xml.i2
-rw-r--r--interface-definitions/policy-local-route.xml.in88
4 files changed, 65 insertions, 65 deletions
diff --git a/interface-definitions/include/policy/local-route_rule_ipv4_address.xml.i b/interface-definitions/include/policy/local-route_rule_ipv4_address.xml.i
new file mode 100644
index 000000000..ffe73ee32
--- /dev/null
+++ b/interface-definitions/include/policy/local-route_rule_ipv4_address.xml.i
@@ -0,0 +1,20 @@
+<!-- include start from policy/local-route_rule_ipv4_address.xml.i -->
+<leafNode name="address">
+ <properties>
+ <help>IPv4 address or prefix</help>
+ <valueHelp>
+ <format>ipv4</format>
+ <description>Address to match against</description>
+ </valueHelp>
+ <valueHelp>
+ <format>ipv4net</format>
+ <description>Prefix to match against</description>
+ </valueHelp>
+ <constraint>
+ <validator name="ipv4-address"/>
+ <validator name="ip-prefix"/>
+ </constraint>
+ <multi/>
+ </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/policy/local-route_rule_ipv6_address.xml.i b/interface-definitions/include/policy/local-route_rule_ipv6_address.xml.i
new file mode 100644
index 000000000..d8fb6c074
--- /dev/null
+++ b/interface-definitions/include/policy/local-route_rule_ipv6_address.xml.i
@@ -0,0 +1,20 @@
+<!-- include start from policy/local-route_rule_ipv6_address.xml.i -->
+<leafNode name="address">
+ <properties>
+ <help>IPv6 address or prefix</help>
+ <valueHelp>
+ <format>ipv6</format>
+ <description>Address to match against</description>
+ </valueHelp>
+ <valueHelp>
+ <format>ipv6net</format>
+ <description>Prefix to match against</description>
+ </valueHelp>
+ <constraint>
+ <validator name="ipv6-address"/>
+ <validator name="ipv6-prefix"/>
+ </constraint>
+ <multi/>
+ </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/version/policy-version.xml.i b/interface-definitions/include/version/policy-version.xml.i
index f1494eaa3..2c96e0f15 100644
--- a/interface-definitions/include/version/policy-version.xml.i
+++ b/interface-definitions/include/version/policy-version.xml.i
@@ -1,3 +1,3 @@
<!-- include start from include/version/policy-version.xml.i -->
-<syntaxVersion component='policy' version='5'></syntaxVersion>
+<syntaxVersion component='policy' version='6'></syntaxVersion>
<!-- include end -->
diff --git a/interface-definitions/policy-local-route.xml.in b/interface-definitions/policy-local-route.xml.in
index 0a5b81dfa..6827bd64e 100644
--- a/interface-definitions/policy-local-route.xml.in
+++ b/interface-definitions/policy-local-route.xml.in
@@ -54,42 +54,22 @@
</properties>
</leafNode>
#include <include/policy/local-route_rule_protocol.xml.i>
- <leafNode name="source">
+ <node name="source">
<properties>
- <help>Source address or prefix</help>
- <valueHelp>
- <format>ipv4</format>
- <description>Address to match against</description>
- </valueHelp>
- <valueHelp>
- <format>ipv4net</format>
- <description>Prefix to match against</description>
- </valueHelp>
- <constraint>
- <validator name="ipv4-address"/>
- <validator name="ip-prefix"/>
- </constraint>
- <multi/>
+ <help>Source parameters</help>
</properties>
- </leafNode>
- <leafNode name="destination">
+ <children>
+ #include <include/policy/local-route_rule_ipv4_address.xml.i>
+ </children>
+ </node>
+ <node name="destination">
<properties>
- <help>Destination address or prefix</help>
- <valueHelp>
- <format>ipv4</format>
- <description>Address to match against</description>
- </valueHelp>
- <valueHelp>
- <format>ipv4net</format>
- <description>Prefix to match against</description>
- </valueHelp>
- <constraint>
- <validator name="ipv4-address"/>
- <validator name="ip-prefix"/>
- </constraint>
- <multi/>
+ <help>Destination parameters</help>
</properties>
- </leafNode>
+ <children>
+ #include <include/policy/local-route_rule_ipv4_address.xml.i>
+ </children>
+ </node>
#include <include/interface/inbound-interface.xml.i>
</children>
</tagNode>
@@ -145,42 +125,22 @@
</constraint>
</properties>
</leafNode>
- <leafNode name="source">
+ <node name="source">
<properties>
- <help>Source address or prefix</help>
- <valueHelp>
- <format>ipv6</format>
- <description>Address to match against</description>
- </valueHelp>
- <valueHelp>
- <format>ipv6net</format>
- <description>Prefix to match against</description>
- </valueHelp>
- <constraint>
- <validator name="ipv6-address"/>
- <validator name="ipv6-prefix"/>
- </constraint>
- <multi/>
+ <help>Source parameters</help>
</properties>
- </leafNode>
- <leafNode name="destination">
+ <children>
+ #include <include/policy/local-route_rule_ipv6_address.xml.i>
+ </children>
+ </node>
+ <node name="destination">
<properties>
- <help>Destination address or prefix</help>
- <valueHelp>
- <format>ipv6</format>
- <description>Address to match against</description>
- </valueHelp>
- <valueHelp>
- <format>ipv6net</format>
- <description>Prefix to match against</description>
- </valueHelp>
- <constraint>
- <validator name="ipv6-address"/>
- <validator name="ipv6-prefix"/>
- </constraint>
- <multi/>
+ <help>Destination parameters</help>
</properties>
- </leafNode>
+ <children>
+ #include <include/policy/local-route_rule_ipv6_address.xml.i>
+ </children>
+ </node>
#include <include/interface/inbound-interface.xml.i>
</children>
</tagNode>