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

5 files changed, 219 insertions, 0 deletions

diff --git a/Makefile b/Makefile
index 2333eebed..63d23495d 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,11 @@ interface_definitions: $(config_xml_obj)
 	rm -rf $(TMPL_DIR)/qos
 	rm -rf $(TMPL_DIR)/interfaces/input
 
+	# T2472 - EIGRP support
+	rm -rf $(TMPL_DIR)/protocols/eigrp
+	# T2773 - EIGRP support for VRF
+	rm -rf $(TMPL_DIR)/vrf/name/node.tag/protocols
+
 	# XXX: test if there are empty node.def files - this is not allowed as these
 	# could mask help strings or mandatory priority statements
 	find $(TMPL_DIR) -name node.def -type f -empty -exec false {} + || sh -c 'echo "There are empty node.def files! Check your interface definitions." && exit 1'
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>
diff --git a/src/conf_mode/protocols_eigrp.py b/src/conf_mode/protocols_eigrp.py
new file mode 100755
index 000000000..21ec51337
--- /dev/null
+++ b/src/conf_mode/protocols_eigrp.py
@@ -0,0 +1,81 @@
+#!/usr/bin/env python3

+#

+# Copyright (C) 2022 VyOS maintainers and contributors

+#

+# This program is free software; you can redistribute it and/or modify

+# it under the terms of the GNU General Public License version 2 or later as

+# published by the Free Software Foundation.

+#

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

+

+def get_config(config=None):

+    if config:

+        conf = config

+    else:

+        conf = Config()

+

+    vrf = None

+    if len(argv) > 1:

+        vrf = argv[1]

+

+    base_path = ['protocols', 'eigrp']

+

+    # eqivalent of the C foo ? 'a' : 'b' statement

+    base = vrf and ['vrf', 'name', vrf, 'protocols', 'eigrp'] or base_path

+    eigrp = conf.get_config_dict(base, key_mangling=('-', '_'),

+                               get_first_key=True, no_tag_node_value_mangle=True)

+

+    # Assign the name of our VRF context. This MUST be done before the return

+    # statement below, else on deletion we will delete the default instance

+    # instead of the VRF instance.

+    if vrf: eigrp.update({'vrf' : vrf})

+

+    if not conf.exists(base):

+        eigrp.update({'deleted' : ''})

+        if not vrf:

+            # We are running in the default VRF context, thus we can not delete

+            # our main EIGRP instance if there are dependent EIGRP VRF instances.

+            eigrp['dependent_vrfs'] = conf.get_config_dict(['vrf', 'name'],

+                key_mangling=('-', '_'),

+                get_first_key=True,

+                no_tag_node_value_mangle=True)

+

+        return eigrp

+

+    # We also need some additional information from the config, prefix-lists

+    # and route-maps for instance. They will be used in verify().

+    #

+    # XXX: one MUST always call this without the key_mangling() option! See

+    # vyos.configverify.verify_common_route_maps() for more information.

+    tmp = conf.get_config_dict(['policy'])

+    # Merge policy dict into "regular" config dict

+    eigrp = dict_merge(tmp, eigrp)

+

+    import pprint

+    pprint.pprint(eigrp)

+    return eigrp

+

+def verify(eigrp):

+    pass

+

+def generate(eigrp):

+    pass

+

+def apply(eigrp):

+    pass

+

+if __name__ == '__main__':

+    try:

+        c = get_config()

+        verify(c)

+        generate(c)

+        apply(c)

+    except ConfigError as e:

+        print(e)

+        exit(1)