eigrp: T2472: improve code for later tests

1 files changed, 17 insertions, 7 deletions

diff --git a/data/templates/frr/eigrpd.frr.j2 b/data/templates/frr/eigrpd.frr.j2
index 3038a0b1d..d16963a51 100644
--- a/data/templates/frr/eigrpd.frr.j2
+++ b/data/templates/frr/eigrpd.frr.j2
@@ -1,21 +1,31 @@
 !
-router eigrp {{ local_as }} {{ 'vrf ' ~ vrf if vrf is vyos_defined }}
+router eigrp {{ system_as }} {{ 'vrf ' ~ vrf if vrf is vyos_defined }}
 {% if maximum_paths is vyos_defined %}
-maximum-paths {{ maximum_paths }}
+ maximum-paths {{ maximum_paths }}
 {% endif %}
 {% if metric.weights is vyos_defined %}
-metric weights {{ metric.weights }}
+ metric weights {{ metric.weights }}
 {% endif %}
 {% if network is vyos_defined %}
 {%     for net in network %}
-network {{ net }}
+ network {{ net }}
+{%     endfor %}
+{% endif %}
+{% if passive_interface is vyos_defined %}
+{%     for interface in passive_interface %}
+ passive-interface {{ interface }}
 {%     endfor %}
 {% endif %}
 {% if redistribute is vyos_defined %}
 {%     for protocol in redistribute %}
-redistribute {{ protocol }}
+ redistribute {{ protocol }}
 {%     endfor %}
 {% endif %}
+{% if router_id is vyos_defined %}
+ eigrp router-id {{ router_id }}
+{% endif %}
 {% if variance is vyos_defined %}
-variance {{ variance }}
-{% endif %}
\ No newline at end of file
+ variance {{ variance }}
+{% endif %}
+exit
+!