Merge pull request #620 from jack9603301/T3030

tunnel: T3030: Add erspan protocol support

4 files changed, 192 insertions, 101 deletions

diff --git a/interface-definitions/include/tunnel-local-remote-ip.xml.i b/interface-definitions/include/tunnel-local-remote-ip.xml.i
new file mode 100644
index 000000000..85c20f482
--- /dev/null
+++ b/interface-definitions/include/tunnel-local-remote-ip.xml.i
@@ -0,0 +1,37 @@
+<!-- included start from tunnel-local-remote-ip.xml.i -->
+<leafNode name="local-ip">
+  <properties>
+    <help>Local IP address for this tunnel</help>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>Local IPv4 address for this tunnel</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv6</format>
+      <description>Local IPv6 address for this tunnel</description>
+    </valueHelp>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_local_ips.sh --both</script>
+    </completionHelp>
+    <constraint>
+      <validator name="ip-address"/>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="remote-ip">
+  <properties>
+    <help>Remote IP address for this tunnel</help>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>Remote IPv4 address for this tunnel</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv6</format>
+      <description>Remote IPv6 address for this tunnel</description>
+    </valueHelp>
+    <constraint>
+      <!-- does it need fixing/changing to be more restrictive ? -->
+      <validator name="ip-address"/>
+    </constraint>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/tunnel-parameters-ip.xml.i b/interface-definitions/include/tunnel-parameters-ip.xml.i
new file mode 100644
index 000000000..c304bd3ff
--- /dev/null
+++ b/interface-definitions/include/tunnel-parameters-ip.xml.i
@@ -0,0 +1,49 @@
+<!-- included start from tunnel-parameters-ip.xml.i -->
+<node name="ip">
+  <properties>
+    <help>IPv4 specific tunnel parameters</help>
+  </properties>
+  <children>
+    <leafNode name="ttl">
+      <properties>
+        <help>Time to live field</help>
+        <valueHelp>
+          <format>0-255</format>
+          <description>Time to live (default 255)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-255"/>
+        </constraint>
+        <constraintErrorMessage>TTL must be between 0 and 255</constraintErrorMessage>
+      </properties>
+      <defaultValue>255</defaultValue>
+    </leafNode>
+    <leafNode name="tos">
+      <properties>
+        <help>Type of Service (TOS)</help>
+        <valueHelp>
+          <format>0-99</format>
+          <description>Type of Service (TOS)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-99"/>
+        </constraint>
+        <constraintErrorMessage>TOS must be between 0 and 99</constraintErrorMessage>
+      </properties>
+      <defaultValue>inherit</defaultValue>
+    </leafNode>
+    <leafNode name="key">
+      <properties>
+        <help>Tunnel key</help>
+        <valueHelp>
+          <format>u32</format>
+          <description>Tunnel key</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-4294967295"/>
+        </constraint>
+        <constraintErrorMessage>key must be between 0-4294967295</constraintErrorMessage>
+      </properties>
+    </leafNode>
+  </children>
+</node>
diff --git a/interface-definitions/interfaces-erspan.xml.in b/interface-definitions/interfaces-erspan.xml.in
new file mode 100644
index 000000000..afc29a658
--- /dev/null
+++ b/interface-definitions/interfaces-erspan.xml.in
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="interfaces">
+    <children>
+      <tagNode name="erspan" owner="${vyos_conf_scripts_dir}/interfaces-erspan.py">
+        <properties>
+          <help>Encapsulated Remote SPAN over GRE and IPv4/IPv6 Tunnel Interface</help>
+          <priority>310</priority>
+          <constraint>
+            <regex>^ersp[0-9]+$</regex>
+          </constraint>
+          <constraintErrorMessage>ERSPAN tunnel interface must be named erspN</constraintErrorMessage>
+          <valueHelp>
+            <format>erspN</format>
+            <description>ERSPAN Tunnel interface name</description>
+          </valueHelp>
+        </properties>
+        <children>
+          #include <include/interface-description.xml.i>
+          #include <include/interface-disable.xml.i>
+          #include <include/interface-disable-link-detect.xml.i>
+          #include <include/interface-mtu-64-8024.xml.i>
+          #include <include/tunnel-local-remote-ip.xml.i>
+          <leafNode name="encapsulation">
+            <properties>
+              <help>Encapsulation of this tunnel interface</help>
+              <completionHelp>
+                <list>erspan ip6erspan</list>
+              </completionHelp>
+              <valueHelp>
+                <format>erspan</format>
+                <description>Generic Routing Encapsulation</description>
+              </valueHelp>
+              <valueHelp>
+                <format>ip6erspan</format>
+                <description>Generic Routing Encapsulation bridge interface</description>
+              </valueHelp>
+              <constraint>
+                <regex>^(erspan|ip6erspan)$</regex>
+              </constraint>
+              <constraintErrorMessage>Invalid encapsulation, must be one of: erspan, ip6erspan</constraintErrorMessage>
+            </properties>
+          </leafNode>
+          <node name="parameters">
+            <properties>
+              <help>ERSPAN Tunnel parameters</help>
+            </properties>
+            <children>
+              #include <include/tunnel-parameters-ip.xml.i>
+              <leafNode name="version">
+                <properties>
+                  <help>ERSPAN version number setting(default:1)</help>
+                  <constraint>
+                    <validator name="numeric" argument="--range 1-2"/>
+                  </constraint>
+                  <constraintErrorMessage>The version number of ERSPAN must be 1 or 2</constraintErrorMessage>
+                </properties>
+                <defaultValue>1</defaultValue>
+              </leafNode>
+              <leafNode name="direction">
+                <properties>
+                  <help>specifies the ERSPAN mirrored traffic's direction</help>
+                  <completionHelp>
+                    <list>ingress egress</list>
+                  </completionHelp>
+                  <valueHelp>
+                    <format>ingress</format>
+                    <description>Mirror ingress direction</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>egress</format>
+                    <description>Mirror egress direction</description>
+                  </valueHelp>
+                  <constraint>
+                    <regex>^(ingress|egress)$</regex>
+                  </constraint>
+                  <constraintErrorMessage>The mirror direction of ERSPAN must be ingress or egress</constraintErrorMessage>
+                </properties>
+              </leafNode>
+              <leafNode name="hwid">
+                <properties>
+                  <help>an unique identifier of an ERSPAN v2 engine within a system</help>
+                  <constraint>
+                    <validator name="numeric" argument="--range 1-1048575"/>
+                  </constraint>
+                  <constraintErrorMessage>ERSPAN hwid must be a number(range:0-1048575)</constraintErrorMessage>
+                </properties>
+              </leafNode>
+              <leafNode name="idx">
+                <properties>
+                  <help>specifies the ERSPAN v1 index field</help>
+                  <constraint>
+                    <validator name="numeric" argument="--range 0-63"/>
+                  </constraint>
+                  <constraintErrorMessage>ERSPAN idx must be a number(range:0-63)</constraintErrorMessage>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
+        </children>
+      </tagNode>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/interface-definitions/interfaces-tunnel.xml.in b/interface-definitions/interfaces-tunnel.xml.in
index 7fa847ab0..279c05cca 100644
--- a/interface-definitions/interfaces-tunnel.xml.in
+++ b/interface-definitions/interfaces-tunnel.xml.in
@@ -27,42 +27,7 @@
           </leafNode>
           #include <include/interface-ipv4-options.xml.i>
           #include <include/interface-ipv6-options.xml.i>
-          <leafNode name="local-ip">
-            <properties>
-              <help>Local IP address for this tunnel</help>
-              <valueHelp>
-                <format>ipv4</format>
-                <description>Local IPv4 address for this tunnel</description>
-              </valueHelp>
-              <valueHelp>
-                <format>ipv6</format>
-                <description>Local IPv6 address for this tunnel [NOTICE: unavailable for mGRE tunnels]</description>
-              </valueHelp>
-              <completionHelp>
-                <script>${vyos_completion_dir}/list_local_ips.sh --both</script>
-              </completionHelp>
-              <constraint>
-                <validator name="ip-address"/>
-              </constraint>
-            </properties>
-          </leafNode>
-          <leafNode name="remote-ip">
-            <properties>
-              <help>Remote IP address for this tunnel</help>
-              <valueHelp>
-                <format>ipv4</format>
-                <description>Remote IPv4 address for this tunnel</description>
-              </valueHelp>
-              <valueHelp>
-                <format>ipv6</format>
-                <description>Remote IPv6 address for this tunnel</description>
-              </valueHelp>
-              <constraint>
-                <!-- does it need fixing/changing to be more restrictive ? -->
-                <validator name="ip-address"/>
-              </constraint>
-            </properties>
-          </leafNode>
+          #include <include/tunnel-local-remote-ip.xml.i>
           <leafNode name="source-interface">
             <properties>
               <help>Physical Interface used for underlaying traffic</help>
@@ -175,71 +140,7 @@
               <help>Tunnel parameters</help>
             </properties>
             <children>
-              <node name="ip">
-                <properties>
-                  <help>IPv4 specific tunnel parameters</help>
-                </properties>
-                <children>
-                  <leafNode name="no-pmtu-discovery">
-                    <properties>
-                      <help>Disable path MTU discovery</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="ttl">
-                    <properties>
-                      <help>Time to live (default: 0)</help>
-                      <valueHelp>
-                        <format>0</format>
-                        <description>Copy value from original IP header</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>1-255</format>
-                        <description>Time to Live</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 0-255"/>
-                      </constraint>
-                      <constraintErrorMessage>TTL must be between 0 and 255</constraintErrorMessage>
-                    </properties>
-                    <defaultValue>0</defaultValue>
-                  </leafNode>
-                  <leafNode name="tos">
-                    <properties>
-                      <help>Type of Service (default: 0)</help>
-                      <completionHelp>
-                        <list>inherit</list>
-                      </completionHelp>
-                      <valueHelp>
-                        <format>0</format>
-                        <description>Copy value from original IP header</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>1-99</format>
-                        <description>Type of Service (TOS)</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 0-99"/>
-                      </constraint>
-                      <constraintErrorMessage>TOS must be between 0 and 99</constraintErrorMessage>
-                    </properties>
-                    <defaultValue>0</defaultValue>
-                  </leafNode>
-                  <leafNode name="key">
-                    <properties>
-                      <help>Tunnel key</help>
-                      <valueHelp>
-                        <format>u32</format>
-                        <description>Tunnel key</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 0-4294967295"/>
-                      </constraint>
-                      <constraintErrorMessage>Key must be in range 0-4294967295</constraintErrorMessage>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
+              #include <include/tunnel-parameters-ip.xml.i>
               <node name="ipv6">
                 <properties>
                   <help>IPv6 specific tunnel parameters</help>