isis: T3576: support metric and route-map when originating a default route

4 files changed, 53 insertions, 53 deletions

diff --git a/data/templates/frr/isis.frr.tmpl b/data/templates/frr/isis.frr.tmpl
index 433f10892..58c44e2d4 100644
--- a/data/templates/frr/isis.frr.tmpl
+++ b/data/templates/frr/isis.frr.tmpl
@@ -101,11 +101,10 @@ router isis VyOS {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
  area-password clear {{ area_password.plaintext_password }}
 {% endif %}
 {% if default_information is defined and default_information.originate is defined and default_information.originate is not none %}
-{%   for level in default_information.originate.ipv4 if default_information.originate.ipv4 is defined %}
- default-information originate ipv4 {{ level | replace('_', '-') }}
-{%   endfor %}
-{%   for level in default_information.originate.ipv6 if default_information.originate.ipv6 is defined %}
- default-information originate ipv6 {{ level | replace('_', '-') }} always
+{%   for afi, afi_config in default_information.originate.items() %}
+{%     for level, level_config in afi_config.items() %}
+ default-information originate {{ afi }} {{ level | replace('_', '-') }} {{ 'always' if level_config.always is defined }} {{ 'route-map ' ~ level_config.route_map if level_config.route_map is defined }} {{ 'metric ' ~ level_config.metric if level_config.metric is defined }}
+{%     endfor %}
 {%   endfor %}
 {% endif %}
 {% if redistribute is defined and redistribute.ipv4 is defined and redistribute.ipv4 is not none %}
diff --git a/interface-definitions/include/isis/default-information-level.xml.i b/interface-definitions/include/isis/default-information-level.xml.i
new file mode 100644
index 000000000..5ade72a4b
--- /dev/null
+++ b/interface-definitions/include/isis/default-information-level.xml.i
@@ -0,0 +1,32 @@
+<!-- include start from isis/default-information-level.xml.i -->
+<node name="level-1">
+  <properties>
+    <help>Distribute default route into level-1</help>
+  </properties>
+  <children>
+    <leafNode name="always">
+      <properties>
+        <help>Always advertise default route</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    #include <include/isis/metric.xml.i>
+    #include <include/route-map.xml.i>
+  </children>
+</node>
+<node name="level-2">
+  <properties>
+    <help>Distribute default route into level-2</help>
+  </properties>
+  <children>
+    <leafNode name="always">
+      <properties>
+        <help>Always advertise default route</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    #include <include/isis/metric.xml.i>
+    #include <include/route-map.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/isis/metric.xml.i b/interface-definitions/include/isis/metric.xml.i
new file mode 100644
index 000000000..30e2cdc10
--- /dev/null
+++ b/interface-definitions/include/isis/metric.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from isis/metric.xml.i -->
+<leafNode name="metric">
+  <properties>
+    <help>Set default metric for circuit</help>
+    <valueHelp>
+      <format>u32:0-16777215</format>
+      <description>Default metric value</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-16777215"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/isis/protocol-common-config.xml.i b/interface-definitions/include/isis/protocol-common-config.xml.i
index c4a913385..9b8283f40 100644
--- a/interface-definitions/include/isis/protocol-common-config.xml.i
+++ b/interface-definitions/include/isis/protocol-common-config.xml.i
@@ -39,18 +39,7 @@
             <help>Distribute default route for IPv4</help>
           </properties>
           <children>
-            <leafNode name="level-1">
-              <properties>
-                <help>Distribute default route into level-1</help>
-                <valueless/>
-              </properties>
-            </leafNode>
-            <leafNode name="level-2">
-              <properties>
-                <help>Distribute default route into level-2</help>
-                <valueless/>
-              </properties>
-            </leafNode>
+            #include <include/isis/default-information-level.xml.i>
           </children>
         </node>
         <node name="ipv6">
@@ -58,30 +47,7 @@
             <help>Distribute default route for IPv6</help>
           </properties>
           <children>
-            <leafNode name="level-1">
-              <properties>
-                <help>Distribute default route into level-1</help>
-                <completionHelp>
-                  <list>always</list>
-                </completionHelp>
-                <valueHelp>
-                  <format>always</format>
-                  <description>Always advertise default route</description>
-                </valueHelp>
-              </properties>
-            </leafNode>
-            <leafNode name="level-2">
-              <properties>
-                <help>Distribute default route into level-2</help>
-                <completionHelp>
-                  <list>always</list>
-                </completionHelp>
-                <valueHelp>
-                  <format>always</format>
-                  <description>Always advertise default route</description>
-                </valueHelp>
-              </properties>
-            </leafNode>
+            #include <include/isis/default-information-level.xml.i>
           </children>
         </node>
       </children>
@@ -677,18 +643,7 @@
         </constraint>
       </properties>
     </leafNode>
-    <leafNode name="metric">
-      <properties>
-        <help>Set default metric for circuit</help>
-        <valueHelp>
-          <format>u32:0-16777215</format>
-          <description>Default metric value</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 0-16777215"/>
-        </constraint>
-      </properties>
-    </leafNode>
+    #include <include/isis/metric.xml.i>
     <node name="network">
       <properties>
         <help>Set network type</help>