Merge pull request #5020 from natali-rs1985/T8325

vpp: T8325: Migrate gre interface to 'interfaces vpp gre'

2 files changed, 81 insertions, 67 deletions

diff --git a/interface-definitions/vpp.xml.in b/interface-definitions/vpp.xml.in
index 733e8eb83..517129e78 100644
--- a/interface-definitions/vpp.xml.in
+++ b/interface-definitions/vpp.xml.in
@@ -79,73 +79,6 @@
               <!-- #include <include/kernel-interface-tun.xml.i> -->
             <!-- </children> -->
           <!-- </tagNode> -->
-          <tagNode name="gre" owner="${vyos_conf_scripts_dir}/vpp_interfaces_gre.py">
-            <properties>
-              <priority>325</priority>
-              <help>Generic Network Encapsulation (GRE) Interface</help>
-              <constraint>
-                <regex>gre[0-9]+</regex>
-              </constraint>
-              <constraintErrorMessage>GRE interface must be named greN</constraintErrorMessage>
-              <valueHelp>
-                <format>greN</format>
-                <description>GRE interface name</description>
-              </valueHelp>
-            </properties>
-            <children>
-              #include <include/generic-description.xml.i>
-              #include <include/interface/disable.xml.i>
-              <leafNode name="mode">
-                <properties>
-                  <help>GRE tunnel mode</help>
-                  <completionHelp>
-                    <list>point-to-point point-to-multipoint</list>
-                  </completionHelp>
-                  <valueHelp>
-                    <format>point-to-point</format>
-                    <description>Point to point mode</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>point-to-multipoint</format>
-                    <description>Point to multipoint mode</description>
-                  </valueHelp>
-                  <constraint>
-                    <regex>(point-to-point|point-to-multipoint)</regex>
-                  </constraint>
-                  <constraintErrorMessage>Invalid mode, must be one of: point-to-point or point-to-multipoint</constraintErrorMessage>
-                </properties>
-                <defaultValue>point-to-point</defaultValue>
-              </leafNode>
-              <leafNode name="tunnel-type">
-                <properties>
-                  <help>GRE tunnel type</help>
-                  <completionHelp>
-                    <list>erspan l3 teb</list>
-                  </completionHelp>
-                  <valueHelp>
-                    <format>erspan</format>
-                    <description>Encapsulated Remote Switched Port Analyzer</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>l3</format>
-                    <description>Generic Routing Encapsulation (network layer)</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>teb</format>
-                    <description>L2 Transparent Ethernet Bridge</description>
-                  </valueHelp>
-                  <constraint>
-                    <regex>(erspan|l3|teb)</regex>
-                  </constraint>
-                  <constraintErrorMessage>Invalid encapsulation, must be one of: l3, teb or erspan</constraintErrorMessage>
-                </properties>
-                <defaultValue>l3</defaultValue>
-              </leafNode>
-              #include <include/source-address-ipv4-ipv6.xml.i>
-              #include <include/interface/tunnel-remote.xml.i>
-              #include <include/kernel-interface-tun.xml.i>
-            </children>
-          </tagNode>
           <tagNode name="xconnect" owner="${vyos_conf_scripts_dir}/vpp_interfaces_xconnect.py">
             <properties>
               <help>Layer 2 cross connect</help>
diff --git a/interface-definitions/vpp_interface_gre.xml.in b/interface-definitions/vpp_interface_gre.xml.in
new file mode 100644
index 000000000..7636c6e2f
--- /dev/null
+++ b/interface-definitions/vpp_interface_gre.xml.in
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name='interfaces'>
+    <children>
+      <node name='vpp'>
+        <children>
+          <tagNode name="gre" owner="${vyos_conf_scripts_dir}/vpp_interfaces_gre.py">
+            <properties>
+              <priority>325</priority>
+              <help>Generic Network Encapsulation (GRE) Interface</help>
+              <constraint>
+                <regex>vppgre[0-9]+</regex>
+              </constraint>
+              <constraintErrorMessage>GRE interface must be named vppgreN</constraintErrorMessage>
+              <valueHelp>
+                <format>vppgreN</format>
+                <description>GRE interface name</description>
+              </valueHelp>
+            </properties>
+            <children>
+              #include <include/generic-description.xml.i>
+              #include <include/interface/disable.xml.i>
+              <!-- Disable as point-to-multipoint mode does not work without 'teib' feature that is not implemented yet -->
+              <!-- <leafNode name="mode">
+              <leafNode name="mode">
+                <properties>
+                  <help>GRE tunnel mode</help>
+                  <completionHelp>
+                    <list>point-to-point point-to-multipoint</list>
+                  </completionHelp>
+                  <valueHelp>
+                    <format>point-to-point</format>
+                    <description>Point to point mode</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>point-to-multipoint</format>
+                    <description>Point to multipoint mode</description>
+                  </valueHelp>
+                  <constraint>
+                    <regex>(point-to-point|point-to-multipoint)</regex>
+                  </constraint>
+                  <constraintErrorMessage>Invalid mode, must be one of: point-to-point or point-to-multipoint</constraintErrorMessage>
+                </properties>
+                <defaultValue>point-to-point</defaultValue>
+              </leafNode> -->
+              <leafNode name="tunnel-type">
+                <properties>
+                  <help>GRE tunnel type</help>
+                  <completionHelp>
+                    <list>erspan l3 teb</list>
+                  </completionHelp>
+                  <valueHelp>
+                    <format>erspan</format>
+                    <description>Encapsulated Remote Switched Port Analyzer</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>l3</format>
+                    <description>Generic Routing Encapsulation (network layer)</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>teb</format>
+                    <description>L2 Transparent Ethernet Bridge</description>
+                  </valueHelp>
+                  <constraint>
+                    <regex>(erspan|l3|teb)</regex>
+                  </constraint>
+                  <constraintErrorMessage>Invalid encapsulation, must be one of: l3, teb or erspan</constraintErrorMessage>
+                </properties>
+                <defaultValue>l3</defaultValue>
+              </leafNode>
+              #include <include/source-address-ipv4-ipv6.xml.i>
+              #include <include/interface/tunnel-remote.xml.i>
+              #include <include/interface/address-ipv4-ipv6.xml.i>
+              #include <include/interface/mtu-68-16000.xml.i>
+            </children>
+          </tagNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>