From 9f7a5f79200782f7849cab72f55a39dedf45f214 Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <v.gletenko@vyos.io>
Date: Fri, 29 Sep 2023 15:56:40 +0000
Subject: T5165: Migrate policy local-route rule x destination to address

Migrate policy local-route <destination|source> to node address

replace 'policy local-route{v6} rule <tag> destination|source <x.x.x.x>'
     => 'policy local-route{v6} rule <tag> destination|source address <x.x.x.x>'
---
 .../policy/local-route_rule_ipv4_address.xml.i     | 20 +++++
 .../policy/local-route_rule_ipv6_address.xml.i     | 20 +++++
 .../include/version/policy-version.xml.i           |  2 +-
 interface-definitions/policy-local-route.xml.in    | 88 ++++++----------------
 4 files changed, 65 insertions(+), 65 deletions(-)
 create mode 100644 interface-definitions/include/policy/local-route_rule_ipv4_address.xml.i
 create mode 100644 interface-definitions/include/policy/local-route_rule_ipv6_address.xml.i

(limited to 'interface-definitions')

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>
-- 
cgit v1.2.3