Merge branch 'eigrp' into current

* eigrp:
  eigrp: T2472: disable protocol by default
  eigrp: T2472: add initial python helper
  eigrp: vrf: T2773: prepare XML definitions for VRF instance
  eigrp: T2473: add XML definitions

3 files changed, 133 insertions, 0 deletions

diff --git a/interface-definitions/include/eigrp/protocol-common-config.xml.i b/interface-definitions/include/eigrp/protocol-common-config.xml.i
new file mode 100644
index 000000000..c8faa0492
--- /dev/null
+++ b/interface-definitions/include/eigrp/protocol-common-config.xml.i
@@ -0,0 +1,107 @@
+<!-- include start from eigrp/protocol-common-config.xml.i -->
+<leafNode name="maximum-paths">
+  <properties>
+    <help>Forward packets over multiple paths</help>
+    <valueHelp>
+      <format>u32:1-32</format>
+      <description>Number of paths</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-32"/>
+    </constraint>
+  </properties>
+</leafNode>
+<node name="metric">
+  <properties>
+    <help>Modify metrics and parameters for advertisement</help>
+  </properties>
+  <children>
+    <leafNode name="weights">
+      <properties>
+        <help>Modify metric coefficients</help>
+        <valueHelp>
+          <format>u32:0-255</format>
+          <description>K1</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-255"/>
+        </constraint>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<leafNode name="network">
+  <properties>
+    <help>Enable routing on an IP network</help>
+    <valueHelp>
+      <format>ipv4net</format>
+      <description>EIGRP network prefix</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ip-prefix"/>
+    </constraint>
+    <multi/>
+  </properties>
+</leafNode>
+<leafNode name="passive-interface">
+  <properties>
+    <help>Suppress routing updates on an interface</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_interfaces.py</script>
+    </completionHelp>
+  </properties>
+</leafNode>
+<leafNode name="redistribute">
+  <properties>
+    <help>Redistribute information from another routing protocol</help>
+    <valueHelp>
+      <format>bgp</format>
+      <description>Border Gateway Protocol (BGP)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>connected</format>
+      <description>Connected routes</description>
+    </valueHelp>
+    <valueHelp>
+      <format>nhrp</format>
+      <description>Next Hop Resolution Protocol (NHRP)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ospf</format>
+      <description>Open Shortest Path First (OSPFv2)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>rip</format>
+      <description>Routing Information Protocol (RIP)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>static</format>
+      <description>Statically configured routes</description>
+    </valueHelp>
+    <valueHelp>
+      <format>vnc</format>
+      <description>Virtual Network Control (VNC)</description>
+    </valueHelp>
+    <completionHelp>
+      <list>bgp connected nhrp ospf rip static vnc</list>
+    </completionHelp>
+    <constraint>
+      <regex>(bgp|connected|nhrp|ospf|rip|static|vnc)</regex>
+    </constraint>
+  </properties>
+</leafNode>
+#include <include/router-id.xml.i>
+<!-- FRR timers not implemented yet -->
+<leafNode name="variance">
+  <properties>
+    <help>Control load balancing variance</help>
+    <valueHelp>
+      <format>u32:1-128</format>
+      <description>Metric variance multiplier</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-128"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/protocols-eigrp.xml.in b/interface-definitions/protocols-eigrp.xml.in
new file mode 100644
index 000000000..88a881a1e
--- /dev/null
+++ b/interface-definitions/protocols-eigrp.xml.in
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!-- Enhanced Interior Gateway Routing Protocol (EIGRP) configuration -->
+<interfaceDefinition>
+  <node name="protocols">
+    <children>
+      <node name="eigrp" owner="${vyos_conf_scripts_dir}/protocols_eigrp.py">
+        <properties>
+          <help>Enhanced Interior Gateway Routing Protocol (EIGRP)</help>
+          <priority>820</priority>
+        </properties>
+        <children>
+          #include <include/eigrp/protocol-common-config.xml.i>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/interface-definitions/vrf.xml.in b/interface-definitions/vrf.xml.in
index 25a573887..b63d60415 100644
--- a/interface-definitions/vrf.xml.in
+++ b/interface-definitions/vrf.xml.in
@@ -58,6 +58,15 @@
                   #include <include/bgp/protocol-common-config.xml.i>
                 </children>
               </node>
+              <node name="eigrp" owner="${vyos_conf_scripts_dir}/protocols_eigrp.py $VAR(../../@)">
+                <properties>
+                  <help>Enhanced Interior Gateway Routing Protocol (EIGRP)</help>
+                  <priority>821</priority>
+                </properties>
+                <children>
+                  #include <include/eigrp/protocol-common-config.xml.i>
+                </children>
+              </node>
               <node name="isis" owner="${vyos_conf_scripts_dir}/protocols_isis.py $VAR(../../@)">
                 <properties>
                   <help>Intermediate System to Intermediate System (IS-IS)</help>