From 45a2a7d0adc7e9d27d6c7aee1ccbd9b64a1437ad Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Mon, 28 Mar 2022 19:49:24 +0300
Subject: Revert "backport: T4515: T4219: policy local-route6 and
 inbound-interface support"

---
 .../include/interface/inbound-interface.xml.i      |  10 --
 interface-definitions/policy-local-route.xml.in    | 123 +--------------------
 2 files changed, 1 insertion(+), 132 deletions(-)
 delete mode 100644 interface-definitions/include/interface/inbound-interface.xml.i

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/interface/inbound-interface.xml.i b/interface-definitions/include/interface/inbound-interface.xml.i
deleted file mode 100644
index 5a8d47280..000000000
--- a/interface-definitions/include/interface/inbound-interface.xml.i
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- include start from interface/inbound-interface.xml.i -->
-<leafNode name="inbound-interface">
-  <properties>
-  <help>Inbound Interface</help>
-  <completionHelp>
-    <script>${vyos_completion_dir}/list_interfaces.py</script>
-  </completionHelp>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/policy-local-route.xml.in b/interface-definitions/policy-local-route.xml.in
index 573a7963f..3769c3748 100644
--- a/interface-definitions/policy-local-route.xml.in
+++ b/interface-definitions/policy-local-route.xml.in
@@ -14,7 +14,7 @@
               <valueHelp>
                 <!-- table main with prio 32766 -->
                 <format>u32:1-32765</format>
-                <description>Local-route rule number (1-32765)</description>
+                <description>Local-route rule number (1-219)</description>
               </valueHelp>
               <constraint>
                 <validator name="numeric" argument="--range 1-32765"/>
@@ -40,18 +40,6 @@
                   </leafNode>
                 </children>
               </node>
-              <leafNode name="fwmark">
-                <properties>
-                  <help>Match fwmark value</help>
-                  <valueHelp>
-                    <format>u32:1-2147483647</format>
-                    <description>Address to match against</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-2147483647"/>
-                  </constraint>
-                </properties>
-              </leafNode>
               <leafNode name="source">
                 <properties>
                   <help>Source address or prefix</help>
@@ -70,115 +58,6 @@
                   <multi/>
                 </properties>
               </leafNode>
-              <leafNode 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/>
-                </properties>
-              </leafNode>
-              #include <include/interface/inbound-interface.xml.i>
-            </children>
-          </tagNode>
-        </children>
-      </node>
-      <node name="local-route6" owner="${vyos_conf_scripts_dir}/policy-local-route.py">
-        <properties>
-          <help>IPv6 policy route of local traffic</help>
-        </properties>
-        <children>
-          <tagNode name="rule">
-            <properties>
-              <help>IPv6 policy local-route rule set number</help>
-              <valueHelp>
-                <!-- table main with prio 32766 -->
-                <format>u32:1-32765</format>
-                <description>Local-route rule number (1-32765)</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 1-32765"/>
-              </constraint>
-            </properties>
-            <children>
-              <node name="set">
-                <properties>
-                  <help>Packet modifications</help>
-                </properties>
-                <children>
-                  <leafNode name="table">
-                    <properties>
-                      <help>Routing table to forward packet with</help>
-                      <valueHelp>
-                        <format>u32:1-200</format>
-                        <description>Table number</description>
-                      </valueHelp>
-                      <completionHelp>
-                        <list>main</list>
-                      </completionHelp>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-              <leafNode name="fwmark">
-                <properties>
-                  <help>Match fwmark value</help>
-                  <valueHelp>
-                    <format>u32:1-2147483647</format>
-                    <description>Address to match against</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-2147483647"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode 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="ipv6-address"/>
-                    <validator name="ipv6-prefix"/>
-                  </constraint>
-                  <multi/>
-                </properties>
-              </leafNode>
-              <leafNode 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/>
-                </properties>
-              </leafNode>
-              #include <include/interface/inbound-interface.xml.i>
             </children>
           </tagNode>
         </children>
-- 
cgit v1.2.3