diff options
| -rw-r--r-- | data/templates/frr/isis.frr.tmpl | 13 | ||||
| -rw-r--r-- | interface-definitions/include/isis/protocol-common-config.xml.i | 3 | ||||
| -rw-r--r-- | interface-definitions/protocols-isis.xml.in | 1 |
3 files changed, 10 insertions, 7 deletions
diff --git a/data/templates/frr/isis.frr.tmpl b/data/templates/frr/isis.frr.tmpl index c8e11399e..c74ac3101 100644 --- a/data/templates/frr/isis.frr.tmpl +++ b/data/templates/frr/isis.frr.tmpl @@ -1,4 +1,13 @@ ! +{% if vrf is defined and vrf is not none and route_map is defined and route_map is not none %} +vrf {{ vrf }} + ip protocol isis route-map {{ route_map }} + exit-vrf +! +{% elif route_map is defined and route_map is not none %} +ip protocol isis route-map {{ route_map }} +{% endif %} +! router isis VyOS {{ 'vrf ' + vrf if vrf is defined and vrf is not none }} net {{ net }} {% if dynamic_hostname is defined %} @@ -174,7 +183,3 @@ interface {{ iface }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none }} {% endfor %} {% endif %} ! -{% if route_map is defined and route_map is not none %} -ip protocol isis route-map {{ route_map }} -{% endif %} -! diff --git a/interface-definitions/include/isis/protocol-common-config.xml.i b/interface-definitions/include/isis/protocol-common-config.xml.i index caeaa8773..c4a913385 100644 --- a/interface-definitions/include/isis/protocol-common-config.xml.i +++ b/interface-definitions/include/isis/protocol-common-config.xml.i @@ -616,8 +616,6 @@ </properties> </leafNode> <tagNode name="interface"> - <!-- (config-if)# ip router isis WORD (same as name of IS-IS process) - if any section of "interface" pesent --> <properties> <help>Interface params</help> <completionHelp> @@ -753,4 +751,5 @@ </leafNode> </children> </tagNode> +#include <include/route-map.xml.i> <!-- include end --> diff --git a/interface-definitions/protocols-isis.xml.in b/interface-definitions/protocols-isis.xml.in index 073528e20..e0bc47bb9 100644 --- a/interface-definitions/protocols-isis.xml.in +++ b/interface-definitions/protocols-isis.xml.in @@ -9,7 +9,6 @@ </properties> <children> #include <include/isis/protocol-common-config.xml.i> - #include <include/route-map.xml.i> </children> </node> </children> |