isis: T3417: add VRF support

VRF support can be tested using:

set vrf name red table 1000
set vrf name red protocols isis domain FOOO
set vrf name red protocols isis net 49.0001.1921.6800.1002.00
set vrf name red protocols isis interface eth1

6 files changed, 887 insertions, 785 deletions

diff --git a/data/templates/frr/isis.frr.tmpl b/data/templates/frr/isis.frr.tmpl
index d4500403c..da098abac 100644
--- a/data/templates/frr/isis.frr.tmpl
+++ b/data/templates/frr/isis.frr.tmpl
@@ -1,5 +1,5 @@
 !
-router isis {{ domain }}
+router isis {{ domain }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
  net {{ net }}
 {% if dynamic_hostname is defined %}
  hostname dynamic
@@ -133,7 +133,7 @@ router isis {{ domain }}
 !
 {% if interface is defined and interface is not none %}
 {%   for iface, iface_config in interface.items() %}
-interface {{ iface }}
+interface {{ iface }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
  ip router isis {{ domain }}
 {%     if iface_config.bfd is defined %}
  isis bfd
diff --git a/interface-definitions/include/isis/isis-common-config.xml.i b/interface-definitions/include/isis/isis-common-config.xml.i
new file mode 100644
index 000000000..94a6e3592
--- /dev/null
+++ b/interface-definitions/include/isis/isis-common-config.xml.i
@@ -0,0 +1,764 @@
+<!-- include start from isis/isis-common-config.xml.i -->
+<node name="area-password">
+  <properties>
+    <help>Configure the authentication password for an area</help>
+  </properties>
+  <children>
+    <leafNode name="plaintext-password">
+      <properties>
+        <help>Plain-text authentication type</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>Level-wide password</description>
+        </valueHelp>
+      </properties>
+    </leafNode>
+    <leafNode name="md5">
+      <properties>
+        <help>MD5 authentication type</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>Level-wide password</description>
+        </valueHelp>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<node name="default-information">
+  <properties>
+    <help>Control distribution of default information</help>
+  </properties>
+  <children>
+    <node name="originate">
+      <properties>
+        <help>Distribute a default route</help>
+      </properties>
+      <children>
+        <node name="ipv4">
+          <properties>
+            <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>
+          </children>
+        </node>
+        <node name="ipv6">
+          <properties>
+            <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>
+          </children>
+        </node>
+      </children>
+    </node>
+  </children>
+</node>
+<leafNode name="domain">
+  <properties>
+    <help>Domain name used for this instance</help>
+    <valueHelp>
+      <format>txt</format>
+      <description>IS-IS routing area domain/tag</description>
+    </valueHelp>
+  </properties>
+</leafNode>
+<node name="domain-password">
+  <properties>
+    <help>Set the authentication password for a routing domain</help>
+  </properties>
+  <children>
+    <leafNode name="plaintext-password">
+      <properties>
+        <help>Plain-text authentication type</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>Level-wide password</description>
+        </valueHelp>
+      </properties>
+    </leafNode>
+<!--
+    <leafNode name="md5">
+      <properties>
+        <help>MD5 authentication type</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>Level-wide password</description>
+        </valueHelp>
+      </properties>
+    </leafNode>
+-->
+  </children>
+</node>
+<leafNode name="dynamic-hostname">
+  <properties>
+    <help>Dynamic hostname for IS-IS</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="level">
+  <properties>
+    <help>IS-IS level number</help>
+    <completionHelp>
+      <list>level-1 level-1-2 level-2</list>
+    </completionHelp>
+    <valueHelp>
+      <format>level-1</format>
+      <description>Act as a station router</description>
+    </valueHelp>
+    <valueHelp>
+      <format>level-1-2</format>
+      <description>Act as both a station and an area router</description>
+    </valueHelp>
+    <valueHelp>
+      <format>level-2</format>
+      <description>Act as an area router</description>
+    </valueHelp>
+    <constraint>
+      <regex>(level-1|level-1-2|level-2)</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="lsp-gen-interval">
+  <properties>
+    <help>Minimum interval between regenerating same LSP</help>
+    <valueHelp>
+      <format>u32:1-120</format>
+      <description>Minimum interval in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-120"/>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="lsp-mtu">
+  <properties>
+    <help>Configure the maximum size of generated LSPs</help>
+    <valueHelp>
+      <format>u32:128-4352</format>
+      <description>Maximum size of generated LSPs</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 128-4352"/>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="lsp-refresh-interval">
+  <properties>
+    <help>LSP refresh interval</help>
+    <valueHelp>
+      <format>u32:1-65235</format>
+      <description>LSP refresh interval in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-65235"/>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="max-lsp-lifetime">
+  <properties>
+    <help>Maximum LSP lifetime</help>
+    <valueHelp>
+      <format>u32:350-65535</format>
+      <description>LSP lifetime in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-65535"/>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="metric-style">
+  <properties>
+    <help>Use old-style (ISO 10589) or new-style packet formats</help>
+    <completionHelp>
+      <list>narrow transition wide</list>
+    </completionHelp>
+    <valueHelp>
+      <format>narrow</format>
+      <description>Use old style of TLVs with narrow metric</description>
+    </valueHelp>
+    <valueHelp>
+      <format>transition</format>
+      <description>Send and accept both styles of TLVs during transition</description>
+    </valueHelp>
+    <valueHelp>
+      <format>wide</format>
+      <description>Use new style of TLVs to carry wider metric</description>
+    </valueHelp>
+    <constraint>
+      <regex>(narrow|transition|wide)</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="net">
+  <properties>
+    <help>A Network Entity Title for this process (ISO only)</help>
+    <valueHelp>
+      <format>XX.XXXX. ... .XXX.XX</format>
+      <description>Network entity title (NET)</description>
+    </valueHelp>
+    <constraint>
+      <regex>[a-fA-F0-9]{2}(\.[a-fA-F0-9]{4}){3,9}\.[a-fA-F0-9]{2}</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="purge-originator">
+  <properties>
+    <help>Use the RFC 6232 purge-originator</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<node name="traffic-engineering">
+  <properties>
+    <help>Show IS-IS neighbor adjacencies</help>
+  </properties>
+  <children>
+    <leafNode name="enable">
+      <properties>
+        <help>Enable MPLS traffic engineering extensions</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+<!--
+    <node name="inter-as">
+      <properties>
+        <help>MPLS traffic engineering inter-AS support</help>
+      </properties>
+      <children>
+        <leafNode name="level-1">
+          <properties>
+            <help>Area native mode self originate inter-AS LSP with L1 only flooding scope</help>
+            <valueless/>
+          </properties>
+        </leafNode>
+        <leafNode name="level-1-2">
+          <properties>
+            <help>Area native mode self originate inter-AS LSP with L1 and L2 flooding scope</help>
+            <valueless/>
+          </properties>
+        </leafNode>
+        <leafNode name="level-2">
+          <properties>
+            <help>Area native mode self originate inter-AS LSP with L2 only flooding scope</help>
+            <valueless/>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+    <leafNode name="inter-as">
+      <properties>
+        <help>MPLS traffic engineering inter-AS support</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+-->
+    <leafNode name="address">
+      <properties>
+        <help>MPLS traffic engineering router ID</help>
+        <valueHelp>
+          <format>ipv4</format>
+          <description>IPv4 address</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ipv4-address"/>
+        </constraint>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<node name="segment-routing">
+  <properties>
+    <help>Segment-Routing (SPRING) settings</help>
+  </properties>
+  <children>
+    <leafNode name="enable">
+      <properties>
+        <help>Enable segment-routing functionality</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <node name="global-block">
+      <properties>
+        <help>Global block label range</help>
+      </properties>
+      <children>
+        <leafNode name="low-label-value">
+          <properties>
+            <help>The lower bound of the global block</help>
+            <valueHelp>
+              <format>u32:16-1048575</format>
+              <description>MPLS label value</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="--range 16-1048575"/>
+            </constraint>
+          </properties>
+        </leafNode>
+        <leafNode name="high-label-value">
+          <properties>
+            <help>The upper bound of the global block</help>
+            <valueHelp>
+              <format>u32:16-1048575</format>
+              <description>MPLS label value</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="--range 16-1048575"/>
+            </constraint>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+<!--
+    <node name="local-block">
+      <properties>
+        <help>Local Block label range</help>
+      </properties>
+      <children>
+        <leafNode name="low-label-value">
+          <properties>
+            <help>The lower bound of the local block</help>
+            <valueHelp>
+              <format>u32:16-1048575</format>
+              <description>MPLS label value</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="  range 16-1048575"/>
+            </constraint>
+          </properties>
+        </leafNode>
+        <leafNode name="high-label-value">
+          <properties>
+            <help>The upper bound of the local block</help>
+            <valueHelp>
+              <format>u32:16-1048575</format>
+              <description>MPLS label value</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="  range 16-1048575"/>
+            </constraint>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+-->
+    <leafNode name="maximum-label-depth">
+      <properties>
+        <help>Maximum MPLS labels allowed for this router</help>
+        <valueHelp>
+          <format>u32:1-16</format>
+            <description>MPLS label depth</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 1-16"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <tagNode name="prefix">
+      <properties>
+        <help>Static IPv4/IPv6 prefix segment/label mapping</help>
+        <valueHelp>
+          <format>ipv4net</format>
+          <description>IPv4 prefix segment</description>
+        </valueHelp>
+        <valueHelp>
+          <format>ipv6net</format>
+          <description>IPv6 prefix segment</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ipv4-prefix"/>
+          <validator name="ipv6-prefix"/>
+        </constraint>
+      </properties>
+      <children>
+        <node name="absolute">
+          <properties>
+            <help>Specify the absolute value of prefix segment/label ID</help>
+          </properties>
+          <children>
+            <leafNode name="value">
+              <properties>
+                <help>Specify the absolute value of prefix segment/label ID</help>
+                <valueHelp>
+                  <format>u32:16-1048575</format>
+                    <description>The absolute segment/label ID value</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="numeric" argument="--range 16-1048575"/>
+                </constraint>
+              </properties>
+            </leafNode>
+            <leafNode name="explicit-null">
+              <properties>
+                <help>Request upstream neighbor to replace segment/label with explicit null label</help>
+                <valueless/>
+              </properties>
+            </leafNode>
+            <leafNode name="no-php-flag">
+              <properties>
+                <help>Do not request penultimate hop popping for segment/label</help>
+                <valueless/>
+              </properties>
+            </leafNode>
+          </children>
+        </node>
+        <node name="index">
+          <properties>
+            <help>Specify the index value of prefix segment/label ID</help>
+          </properties>
+          <children>
+            <leafNode name="value">
+              <properties>
+                <help>Specify the index value of prefix segment/label ID</help>
+                <valueHelp>
+                  <format>u32:0-65535</format>
+                    <description>The index segment/label ID value</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="numeric" argument="--range 0-65535"/>
+                </constraint>
+              </properties>
+            </leafNode>
+            <leafNode name="explicit-null">
+              <properties>
+                <help>Request upstream neighbor to replace segment/label with explicit null label</help>
+                <valueless/>
+              </properties>
+            </leafNode>
+            <leafNode name="no-php-flag">
+              <properties>
+                <help>Do not request penultimate hop popping for segment/label</help>
+                <valueless/>
+              </properties>
+            </leafNode>
+          </children>
+        </node>
+      </children>
+    </tagNode>
+  </children>
+</node>
+<node name="redistribute">
+  <properties>
+    <help>Redistribute information from another routing protocol</help>
+  </properties>
+  <children>
+    <node name="ipv4">
+      <properties>
+        <help>Redistribute IPv4 routes</help>
+      </properties>
+      <children>
+        <node name="bgp">
+          <properties>
+            <help>Border Gateway Protocol (BGP)</help>
+          </properties>
+          <children>
+            #include <include/isis/isis-redistribute-ipv4.xml.i>
+          </children>
+        </node>
+        <node name="connected">
+          <properties>
+            <help>Redistribute connected routes into IS-IS</help>
+          </properties>
+          <children>
+            #include <include/isis/isis-redistribute-ipv4.xml.i>
+          </children>
+        </node>
+        <node name="kernel">
+          <properties>
+            <help>Redistribute kernel routes into IS-IS</help>
+          </properties>
+          <children>
+            #include <include/isis/isis-redistribute-ipv4.xml.i>
+          </children>
+        </node>
+        <node name="ospf">
+          <properties>
+            <help>Redistribute OSPF routes into IS-IS</help>
+          </properties>
+          <children>
+            #include <include/isis/isis-redistribute-ipv4.xml.i>
+          </children>
+        </node>
+        <node name="rip">
+          <properties>
+            <help>Redistribute RIP routes into IS-IS</help>
+          </properties>
+          <children>
+            #include <include/isis/isis-redistribute-ipv4.xml.i>
+          </children>
+        </node>
+        <node name="static">
+          <properties>
+            <help>Redistribute static routes into IS-IS</help>
+          </properties>
+          <children>
+            #include <include/isis/isis-redistribute-ipv4.xml.i>
+          </children>
+        </node>
+      </children>
+    </node>
+  </children>
+</node>
+<leafNode name="set-attached-bit">
+  <properties>
+    <help>Set attached bit to identify as L1/L2 router for inter-area traffic</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="set-overload-bit">
+  <properties>
+    <help>Set overload bit to avoid any transit traffic</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<node name="spf-delay-ietf">
+  <properties>
+    <help>IETF SPF delay algorithm</help>
+  </properties>
+  <children>
+    <leafNode name="init-delay">
+      <properties>
+        <help>Delay used while in QUIET state</help>
+        <valueHelp>
+          <format>u32:0-60000</format>
+          <description>Delay used while in QUIET state (in ms)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-60000"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="short-delay">
+      <properties>
+        <help>Delay used while in SHORT_WAIT state</help>
+        <valueHelp>
+          <format>u32:0-60000</format>
+          <description>Delay used while in SHORT_WAIT state (in ms)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-60000"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="long-delay">
+      <properties>
+        <help>Delay used while in LONG_WAIT</help>
+        <valueHelp>
+          <format>u32:0-60000</format>
+          <description>Delay used while in LONG_WAIT state (in ms)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-60000"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="holddown">
+      <properties>
+        <help>Time with no received IGP events before considering IGP stable</help>
+        <valueHelp>
+          <format>u32:0-60000</format>
+          <description>Time with no received IGP events before considering IGP stable (in ms)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-60000"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="time-to-learn">
+      <properties>
+        <help>Maximum duration needed to learn all the events related to a single failure</help>
+        <valueHelp>
+          <format>u32:0-60000</format>
+          <description>Maximum duration needed to learn all the events related to a single failure (in ms)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-60000"/>
+        </constraint>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<leafNode name="spf-interval">
+  <properties>
+    <help>Minimum interval between SPF calculations</help>
+    <valueHelp>
+      <format>u32:1-120</format>
+      <description>Minimum interval between consecutive SPFs in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-120"/>
+    </constraint>
+  </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>
+      <script>${vyos_completion_dir}/list_interfaces.py</script>
+    </completionHelp>
+  </properties>
+  <children>
+    #include <include/bfd.xml.i>
+    <leafNode name="circuit-type">
+      <properties>
+        <help>Configure circuit type for interface</help>
+        <completionHelp>
+          <list>level-1 level-1-2 level-2-only</list>
+        </completionHelp>
+        <valueHelp>
+          <format>level-1</format>
+          <description>Level-1 only adjacencies are formed</description>
+        </valueHelp>
+        <valueHelp>
+          <format>level-1-2</format>
+          <description>Level-1-2 adjacencies are formed</description>
+        </valueHelp>
+        <valueHelp>
+          <format>level-2-only</format>
+          <description>Level-2 only adjacencies are formed</description>
+        </valueHelp>
+        <constraint>
+          <regex>(level-1|level-1-2|level-2-only)</regex>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="hello-padding">
+      <properties>
+        <help>Add padding to IS-IS hello packets</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <leafNode name="hello-interval">
+      <properties>
+        <help>Set Hello interval</help>
+        <valueHelp>
+          <format>u32:1-600</format>
+          <description>Set Hello interval</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 1-600"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="hello-multiplier">
+      <properties>
+        <help>Set Hello interval</help>
+        <valueHelp>
+          <format>u32:2-100</format>
+          <description>Set multiplier for Hello holding time</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 2-100"/>
+        </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>
+    <node name="network">
+      <properties>
+        <help>Set network type</help>
+      </properties>
+      <children>
+        <leafNode name="point-to-point">
+          <properties>
+            <help>point-to-point network type</help>
+            <valueless/>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+    #include <include/isis/passive.xml.i>
+    <node name="password">
+      <properties>
+        <help>Configure the authentication password for a circuit</help>
+      </properties>
+      <children>
+        <leafNode name="plaintext-password">
+          <properties>
+            <help>Plain-text authentication type</help>
+            <valueHelp>
+              <format>txt</format>
+              <description>Circuit password</description>
+            </valueHelp>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+    <leafNode name="priority">
+      <properties>
+        <help>Set priority for Designated Router election</help>
+        <valueHelp>
+          <format>u32:0-127</format>
+          <description>Priority value</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-127"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="psnp-interval">
+      <properties>
+        <help>Set PSNP interval in seconds</help>
+        <valueHelp>
+          <format>u32:0-127</format>
+          <description>Priority value</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-127"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="no-three-way-handshake">
+      <properties>
+        <help>Disable three-way handshake</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+  </children>
+</tagNode>
+<!-- include end -->
diff --git a/interface-definitions/protocols-isis.xml.in b/interface-definitions/protocols-isis.xml.in
index e6982aca3..1bc890446 100644
--- a/interface-definitions/protocols-isis.xml.in
+++ b/interface-definitions/protocols-isis.xml.in
@@ -8,768 +8,7 @@
           <priority>610</priority>
         </properties>
         <children>
-          <node name="area-password">
-            <properties>
-              <help>Configure the authentication password for an area</help>
-            </properties>
-            <children>
-              <leafNode name="plaintext-password">
-                <properties>
-                  <help>Plain-text authentication type</help>
-                  <valueHelp>
-                    <format>txt</format>
-                    <description>Level-wide password</description>
-                  </valueHelp>
-                </properties>
-              </leafNode>
-              <leafNode name="md5">
-                <properties>
-                  <help>MD5 authentication type</help>
-                  <valueHelp>
-                    <format>txt</format>
-                    <description>Level-wide password</description>
-                  </valueHelp>
-                </properties>
-              </leafNode>
-            </children>
-          </node>
-          <node name="default-information">
-            <properties>
-              <help>Control distribution of default information</help>
-            </properties>
-            <children>
-              <node name="originate">
-                <properties>
-                  <help>Distribute a default route</help>
-                </properties>
-                <children>
-                  <node name="ipv4">
-                    <properties>
-                      <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>
-                    </children>
-                  </node>
-                  <node name="ipv6">
-                    <properties>
-                      <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>
-                    </children>
-                  </node>
-                </children>
-              </node>
-            </children>
-          </node>
-          <leafNode name="domain">
-            <properties>
-              <help>Domain name used for this instance</help>
-              <valueHelp>
-                <format>txt</format>
-                <description>IS-IS routing area domain/tag</description>
-              </valueHelp>
-            </properties>
-          </leafNode>
-          <node name="domain-password">
-            <properties>
-              <help>Set the authentication password for a routing domain</help>
-            </properties>
-            <children>
-              <leafNode name="plaintext-password">
-                <properties>
-                  <help>Plain-text authentication type</help>
-                  <valueHelp>
-                    <format>txt</format>
-                    <description>Level-wide password</description>
-                  </valueHelp>
-                </properties>
-              </leafNode>
-<!--
-              <leafNode name="md5">
-                <properties>
-                  <help>MD5 authentication type</help>
-                  <valueHelp>
-                    <format>txt</format>
-                    <description>Level-wide password</description>
-                  </valueHelp>
-                </properties>
-              </leafNode>
--->
-            </children>
-          </node>
-          <leafNode name="dynamic-hostname">
-            <properties>
-              <help>Dynamic hostname for IS-IS</help>
-              <valueless/>
-            </properties>
-          </leafNode>
-          <leafNode name="level">
-            <properties>
-              <help>IS-IS level number</help>
-              <completionHelp>
-                <list>level-1 level-1-2 level-2</list>
-              </completionHelp>
-              <valueHelp>
-                <format>level-1</format>
-                <description>Act as a station router</description>
-              </valueHelp>
-              <valueHelp>
-                <format>level-1-2</format>
-                <description>Act as both a station and an area router</description>
-              </valueHelp>
-              <valueHelp>
-                <format>level-2</format>
-                <description>Act as an area router</description>
-              </valueHelp>
-              <constraint>
-                <regex>(level-1|level-1-2|level-2)</regex>
-              </constraint>
-            </properties>
-          </leafNode>
-          <leafNode name="lsp-gen-interval">
-            <properties>
-              <help>Minimum interval between regenerating same LSP</help>
-              <valueHelp>
-                <format>u32:1-120</format>
-                <description>Minimum interval in seconds</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 1-120"/>
-              </constraint>
-            </properties>
-          </leafNode>
-          <leafNode name="lsp-mtu">
-            <properties>
-              <help>Configure the maximum size of generated LSPs</help>
-              <valueHelp>
-                <format>u32:128-4352</format>
-                <description>Maximum size of generated LSPs</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 128-4352"/>
-              </constraint>
-            </properties>
-          </leafNode>
-          <leafNode name="lsp-refresh-interval">
-            <properties>
-              <help>LSP refresh interval</help>
-              <valueHelp>
-                <format>u32:1-65235</format>
-                <description>LSP refresh interval in seconds</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 1-65235"/>
-              </constraint>
-            </properties>
-          </leafNode>
-          <leafNode name="max-lsp-lifetime">
-            <properties>
-              <help>Maximum LSP lifetime</help>
-              <valueHelp>
-                <format>u32:350-65535</format>
-                <description>LSP lifetime in seconds</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 1-65535"/>
-              </constraint>
-            </properties>
-          </leafNode>
-          <leafNode name="metric-style">
-            <properties>
-              <help>Use old-style (ISO 10589) or new-style packet formats</help>
-              <completionHelp>
-                <list>narrow transition wide</list>
-              </completionHelp>
-              <valueHelp>
-                <format>narrow</format>
-                <description>Use old style of TLVs with narrow metric</description>
-              </valueHelp>
-              <valueHelp>
-                <format>transition</format>
-                <description>Send and accept both styles of TLVs during transition</description>
-              </valueHelp>
-              <valueHelp>
-                <format>wide</format>
-                <description>Use new style of TLVs to carry wider metric</description>
-              </valueHelp>
-              <constraint>
-                <regex>(narrow|transition|wide)</regex>
-              </constraint>
-            </properties>
-          </leafNode>
-          <leafNode name="net">
-            <properties>
-              <help>A Network Entity Title for this process (ISO only)</help>
-              <valueHelp>
-                <format>XX.XXXX. ... .XXX.XX</format>
-                <description>Network entity title (NET)</description>
-              </valueHelp>
-              <constraint>
-                <regex>[a-fA-F0-9]{2}(\.[a-fA-F0-9]{4}){3,9}\.[a-fA-F0-9]{2}</regex>
-              </constraint>
-            </properties>
-          </leafNode>
-          <leafNode name="purge-originator">
-            <properties>
-              <help>Use the RFC 6232 purge-originator</help>
-              <valueless/>
-            </properties>
-          </leafNode>
-          <node name="traffic-engineering">
-            <properties>
-              <help>Show IS-IS neighbor adjacencies</help>
-            </properties>
-            <children>
-              <leafNode name="enable">
-                <properties>
-                  <help>Enable MPLS traffic engineering extensions</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-<!--
-              <node name="inter-as">
-                <properties>
-                  <help>MPLS traffic engineering inter-AS support</help>
-                </properties>
-                <children>
-                  <leafNode name="level-1">
-                    <properties>
-                      <help>Area native mode self originate inter-AS LSP with L1 only flooding scope</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="level-1-2">
-                    <properties>
-                      <help>Area native mode self originate inter-AS LSP with L1 and L2 flooding scope</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="level-2">
-                    <properties>
-                      <help>Area native mode self originate inter-AS LSP with L2 only flooding scope</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-              <leafNode name="inter-as">
-                <properties>
-                  <help>MPLS traffic engineering inter-AS support</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
--->
-              <leafNode name="address">
-                <properties>
-                  <help>MPLS traffic engineering router ID</help>
-                  <valueHelp>
-                    <format>ipv4</format>
-                    <description>IPv4 address</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ipv4-address"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-            </children>
-          </node>
-          <node name="segment-routing">
-            <properties>
-              <help>Segment-Routing (SPRING) settings</help>
-            </properties>
-            <children>
-              <leafNode name="enable">
-                <properties>
-                  <help>Enable segment-routing functionality</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <node name="global-block">
-                <properties>
-                  <help>Global block label range</help>
-                </properties>
-                <children>
-                  <leafNode name="low-label-value">
-                    <properties>
-                      <help>The lower bound of the global block</help>
-                      <valueHelp>
-                        <format>u32:16-1048575</format>
-                        <description>MPLS label value</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 16-1048575"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="high-label-value">
-                    <properties>
-                      <help>The upper bound of the global block</help>
-                      <valueHelp>
-                        <format>u32:16-1048575</format>
-                        <description>MPLS label value</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 16-1048575"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-<!--
-              <node name="local-block">
-                <properties>
-                  <help>Local Block label range</help>
-                </properties>
-                <children>
-                  <leafNode name="low-label-value">
-                    <properties>
-                      <help>The lower bound of the local block</help>
-                      <valueHelp>
-                        <format>u32:16-1048575</format>
-                        <description>MPLS label value</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="  range 16-1048575"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="high-label-value">
-                    <properties>
-                      <help>The upper bound of the local block</help>
-                      <valueHelp>
-                        <format>u32:16-1048575</format>
-                        <description>MPLS label value</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="  range 16-1048575"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
--->
-              <leafNode name="maximum-label-depth">
-                <properties>
-                  <help>Maximum MPLS labels allowed for this router</help>
-                  <valueHelp>
-                    <format>u32:1-16</format>
-                      <description>MPLS label depth</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-16"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <tagNode name="prefix">
-                <properties>
-                  <help>Static IPv4/IPv6 prefix segment/label mapping</help>
-                  <valueHelp>
-                    <format>ipv4net</format>
-                    <description>IPv4 prefix segment</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>ipv6net</format>
-                    <description>IPv6 prefix segment</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ipv4-prefix"/>
-                    <validator name="ipv6-prefix"/>
-                  </constraint>
-                </properties>
-                <children>
-                  <node name="absolute">
-                    <properties>
-                      <help>Specify the absolute value of prefix segment/label ID</help>
-                    </properties>
-                    <children>
-                      <leafNode name="value">
-                        <properties>
-                          <help>Specify the absolute value of prefix segment/label ID</help>
-                          <valueHelp>
-                            <format>u32:16-1048575</format>
-                              <description>The absolute segment/label ID value</description>
-                          </valueHelp>
-                          <constraint>
-                            <validator name="numeric" argument="--range 16-1048575"/>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="explicit-null">
-                        <properties>
-                          <help>Request upstream neighbor to replace segment/label with explicit null label</help>
-                          <valueless/>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="no-php-flag">
-                        <properties>
-                          <help>Do not request penultimate hop popping for segment/label</help>
-                          <valueless/>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </node>
-                  <node name="index">
-                    <properties>
-                      <help>Specify the index value of prefix segment/label ID</help>
-                    </properties>
-                    <children>
-                      <leafNode name="value">
-                        <properties>
-                          <help>Specify the index value of prefix segment/label ID</help>
-                          <valueHelp>
-                            <format>u32:0-65535</format>
-                              <description>The index segment/label ID value</description>
-                          </valueHelp>
-                          <constraint>
-                            <validator name="numeric" argument="--range 0-65535"/>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="explicit-null">
-                        <properties>
-                          <help>Request upstream neighbor to replace segment/label with explicit null label</help>
-                          <valueless/>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="no-php-flag">
-                        <properties>
-                          <help>Do not request penultimate hop popping for segment/label</help>
-                          <valueless/>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </node>
-                </children>
-              </tagNode>
-            </children>
-          </node>
-          <node name="redistribute">
-            <properties>
-              <help>Redistribute information from another routing protocol</help>
-            </properties>
-            <children>
-              <node name="ipv4">
-                <properties>
-                  <help>Redistribute IPv4 routes</help>
-                </properties>
-                <children>
-                  <node name="bgp">
-                    <properties>
-                      <help>Border Gateway Protocol (BGP)</help>
-                    </properties>
-                    <children>
-                      #include <include/isis/isis-redistribute-ipv4.xml.i>
-                    </children>
-                  </node>
-                  <node name="connected">
-                    <properties>
-                      <help>Redistribute connected routes into IS-IS</help>
-                    </properties>
-                    <children>
-                      #include <include/isis/isis-redistribute-ipv4.xml.i>
-                    </children>
-                  </node>
-                  <node name="kernel">
-                    <properties>
-                      <help>Redistribute kernel routes into IS-IS</help>
-                    </properties>
-                    <children>
-                      #include <include/isis/isis-redistribute-ipv4.xml.i>
-                    </children>
-                  </node>
-                  <node name="ospf">
-                    <properties>
-                      <help>Redistribute OSPF routes into IS-IS</help>
-                    </properties>
-                    <children>
-                      #include <include/isis/isis-redistribute-ipv4.xml.i>
-                    </children>
-                  </node>
-                  <node name="rip">
-                    <properties>
-                      <help>Redistribute RIP routes into IS-IS</help>
-                    </properties>
-                    <children>
-                      #include <include/isis/isis-redistribute-ipv4.xml.i>
-                    </children>
-                  </node>
-                  <node name="static">
-                    <properties>
-                      <help>Redistribute static routes into IS-IS</help>
-                    </properties>
-                    <children>
-                      #include <include/isis/isis-redistribute-ipv4.xml.i>
-                    </children>
-                  </node>
-                </children>
-              </node>
-            </children>
-          </node>
-          <leafNode name="set-attached-bit">
-            <properties>
-              <help>Set attached bit to identify as L1/L2 router for inter-area traffic</help>
-              <valueless/>
-            </properties>
-          </leafNode>
-          <leafNode name="set-overload-bit">
-            <properties>
-              <help>Set overload bit to avoid any transit traffic</help>
-              <valueless/>
-            </properties>
-          </leafNode>
-          <node name="spf-delay-ietf">
-            <properties>
-              <help>IETF SPF delay algorithm</help>
-            </properties>
-            <children>
-              <leafNode name="init-delay">
-                <properties>
-                  <help>Delay used while in QUIET state</help>
-                  <valueHelp>
-                    <format>u32:0-60000</format>
-                    <description>Delay used while in QUIET state (in ms)</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 0-60000"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="short-delay">
-                <properties>
-                  <help>Delay used while in SHORT_WAIT state</help>
-                  <valueHelp>
-                    <format>u32:0-60000</format>
-                    <description>Delay used while in SHORT_WAIT state (in ms)</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 0-60000"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="long-delay">
-                <properties>
-                  <help>Delay used while in LONG_WAIT</help>
-                  <valueHelp>
-                    <format>u32:0-60000</format>
-                    <description>Delay used while in LONG_WAIT state (in ms)</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 0-60000"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="holddown">
-                <properties>
-                  <help>Time with no received IGP events before considering IGP stable</help>
-                  <valueHelp>
-                    <format>u32:0-60000</format>
-                    <description>Time with no received IGP events before considering IGP stable (in ms)</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 0-60000"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="time-to-learn">
-                <properties>
-                  <help>Maximum duration needed to learn all the events related to a single failure</help>
-                  <valueHelp>
-                    <format>u32:0-60000</format>
-                    <description>Maximum duration needed to learn all the events related to a single failure (in ms)</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 0-60000"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-            </children>
-          </node>
-          <leafNode name="spf-interval">
-            <properties>
-              <help>Minimum interval between SPF calculations</help>
-              <valueHelp>
-                <format>u32:1-120</format>
-                <description>Minimum interval between consecutive SPFs in seconds</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 1-120"/>
-              </constraint>
-            </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>
-                <script>${vyos_completion_dir}/list_interfaces.py</script>
-              </completionHelp>
-            </properties>
-            <children>
-              #include <include/bfd.xml.i>
-              <leafNode name="circuit-type">
-                <properties>
-                  <help>Configure circuit type for interface</help>
-                  <completionHelp>
-                    <list>level-1 level-1-2 level-2-only</list>
-                  </completionHelp>
-                  <valueHelp>
-                    <format>level-1</format>
-                    <description>Level-1 only adjacencies are formed</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>level-1-2</format>
-                    <description>Level-1-2 adjacencies are formed</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>level-2-only</format>
-                    <description>Level-2 only adjacencies are formed</description>
-                  </valueHelp>
-                  <constraint>
-                    <regex>(level-1|level-1-2|level-2-only)</regex>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="hello-padding">
-                <properties>
-                  <help>Add padding to IS-IS hello packets</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <leafNode name="hello-interval">
-                <properties>
-                  <help>Set Hello interval</help>
-                  <valueHelp>
-                    <format>u32:1-600</format>
-                    <description>Set Hello interval</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-600"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="hello-multiplier">
-                <properties>
-                  <help>Set Hello interval</help>
-                  <valueHelp>
-                    <format>u32:2-100</format>
-                    <description>Set multiplier for Hello holding time</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 2-100"/>
-                  </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>
-              <node name="network">
-                <properties>
-                  <help>Set network type</help>
-                </properties>
-                <children>
-                  <leafNode name="point-to-point">
-                    <properties>
-                      <help>point-to-point network type</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-              #include <include/isis/passive.xml.i>
-              <node name="password">
-                <properties>
-                  <help>Configure the authentication password for a circuit</help>
-                </properties>
-                <children>
-                  <leafNode name="plaintext-password">
-                    <properties>
-                      <help>Plain-text authentication type</help>
-                      <valueHelp>
-                        <format>txt</format>
-                        <description>Circuit password</description>
-                      </valueHelp>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-              <leafNode name="priority">
-                <properties>
-                  <help>Set priority for Designated Router election</help>
-                  <valueHelp>
-                    <format>u32:0-127</format>
-                    <description>Priority value</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 0-127"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="psnp-interval">
-                <properties>
-                  <help>Set PSNP interval in seconds</help>
-                  <valueHelp>
-                    <format>u32:0-127</format>
-                    <description>Priority value</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 0-127"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="no-three-way-handshake">
-                <properties>
-                  <help>Disable three-way handshake</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-            </children>
-          </tagNode>
+          #include <include/isis/isis-common-config.xml.i>
         </children>
       </node>
     </children>
diff --git a/interface-definitions/vrf.xml.in b/interface-definitions/vrf.xml.in
index de605e89b..95428eb94 100644
--- a/interface-definitions/vrf.xml.in
+++ b/interface-definitions/vrf.xml.in
@@ -33,16 +33,6 @@
               <help>Routing protocol parameters</help>
             </properties>
             <children>
-              <node name="static" owner="${vyos_conf_scripts_dir}/protocols_static.py $VAR(../../@)">
-                <properties>
-                  <help>Static route parameters</help>
-                  <priority>481</priority>
-                </properties>
-                <children>
-                  #include <include/static/static-route.xml.i>
-                  #include <include/static/static-route6.xml.i>
-                </children>
-              </node>
               <tagNode name="bgp" owner="${vyos_conf_scripts_dir}/protocols_bgp.py $VAR(../../@)">
                 <properties>
                   <help>Border Gateway Protocol (BGP)</help>
@@ -59,6 +49,15 @@
                   #include <include/bgp/bgp-common-config.xml.i>
                 </children>
               </tagNode>
+              <node name="isis" owner="${vyos_conf_scripts_dir}/protocols_isis.py $VAR(../../@)">
+                <properties>
+                  <help>Intermediate System to Intermediate System (IS-IS)</help>
+                  <priority>611</priority>
+                </properties>
+                <children>
+                  #include <include/isis/isis-common-config.xml.i>
+                </children>
+              </node>
               <node name="ospf" owner="${vyos_conf_scripts_dir}/protocols_ospf.py $VAR(../../@)">
                 <properties>
                   <help>Open Shortest Path First (OSPF)</help>
@@ -68,6 +67,16 @@
                   #include <include/ospf/ospf-common-config.xml.i>
                 </children>
               </node>
+              <node name="static" owner="${vyos_conf_scripts_dir}/protocols_static.py $VAR(../../@)">
+                <properties>
+                  <help>Static route parameters</help>
+                  <priority>481</priority>
+                </properties>
+                <children>
+                  #include <include/static/static-route.xml.i>
+                  #include <include/static/static-route6.xml.i>
+                </children>
+              </node>
             </children>
           </node>
           <leafNode name="table">
diff --git a/smoketest/scripts/cli/test_protocols_isis.py b/smoketest/scripts/cli/test_protocols_isis.py
index 765e0ef4e..79d497186 100755
--- a/smoketest/scripts/cli/test_protocols_isis.py
+++ b/smoketest/scripts/cli/test_protocols_isis.py
@@ -36,7 +36,7 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase):
         # Check for running process
         self.assertTrue(process_named_running(PROCESS_NAME))
 
-    def test_isis_redistribute(self):
+    def test_isis_01_redistribute(self):
         prefix_list = 'EXPORT-ISIS'
         route_map = 'EXPORT-ISIS'
         rule = '10'
@@ -57,7 +57,8 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase):
         self.cli_commit()
 
         # Verify all changes
-        tmp = self.getFRRconfig(f'router isis {domain}', end='')
+        # XXX: FRR represents router isis with a trailing whitespace :/
+        tmp = self.getFRRconfig(f'router isis {domain} ')
         self.assertIn(f' net {net}', tmp)
         self.assertIn(f' redistribute ipv4 connected level-2 route-map {route_map}', tmp)
 
@@ -67,5 +68,40 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase):
 
         self.cli_delete(['policy'])
 
+
+    def test_isis_02_vrfs(self):
+        vrfs = ['red', 'green', 'blue']
+        # It is safe to assume that when the basic VRF test works, all other
+        # IS-IS related features work, as we entirely inherit the CLI templates
+        # and Jinja2 FRR template.
+        table = '1000'
+        vrf = 'red'
+        vrf_base = ['vrf', 'name', vrf]
+        vrf_iface = 'eth1'
+        self.cli_set(vrf_base + ['table', table])
+        self.cli_set(vrf_base + ['protocols', 'isis', 'domain', domain])
+        self.cli_set(vrf_base + ['protocols', 'isis', 'net', net])
+        self.cli_set(vrf_base + ['protocols', 'isis', 'interface', vrf_iface])
+        self.cli_set(['interfaces', 'ethernet', vrf_iface, 'vrf', vrf])
+
+        # Also set a default VRF IS-IS config
+        self.cli_set(base_path + ['domain', domain])
+        self.cli_set(base_path + ['net', net])
+        self.cli_set(base_path + ['interface', 'eth0'])
+        self.cli_commit()
+
+        # Verify FRR isisd configuration
+        # XXX: FRR represents router isis with a trailing whitespace :/
+        tmp = self.getFRRconfig(f'router isis {domain} ')
+        self.assertIn(f'router isis {domain}', tmp)
+        self.assertIn(f' net {net}', tmp)
+
+        tmp = self.getFRRconfig(f'router isis {domain} vrf {vrf}')
+        self.assertIn(f'router isis {domain} vrf {vrf}', tmp)
+        self.assertIn(f' net {net}', tmp)
+
+        self.cli_delete(['vrf', 'name', vrf])
+        self.cli_delete(['interfaces', 'ethernet', vrf_iface, 'vrf'])
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)
diff --git a/src/conf_mode/protocols_isis.py b/src/conf_mode/protocols_isis.py
index 24db52567..8acff58cc 100755
--- a/src/conf_mode/protocols_isis.py
+++ b/src/conf_mode/protocols_isis.py
@@ -17,30 +17,61 @@
 import os
 
 from sys import exit
+from sys import argv
 
 from vyos.config import Config
 from vyos.configdict import node_changed
-from vyos import ConfigError
 from vyos.util import call
 from vyos.util import dict_search
+from vyos.util import get_interface_config
 from vyos.template import render_to_string
+from vyos import ConfigError
 from vyos import frr
 from vyos import airbag
 airbag.enable()
 
+frr_daemon = 'isisd'
+
 def get_config(config=None):
     if config:
         conf = config
     else:
         conf = Config()
-    base = ['protocols', 'isis']
+
+    vrf = None
+    if len(argv) > 1:
+        vrf = argv[1]
+
+    base_path = ['protocols', 'isis']
+
+    # eqivalent of the C foo ? 'a' : 'b' statement
+    base = vrf and ['vrf', 'name', vrf, 'protocols', 'isis'] or base_path
     isis = conf.get_config_dict(base, key_mangling=('-', '_'),
                                 get_first_key=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: isis['vrf'] = vrf
+
+    # As we no re-use this Python handler for both VRF and non VRF instances for
+    # IS-IS we need to find out if any interfaces changed so properly adjust
+    # the FRR configuration and not by acctident change interfaces from a
+    # different VRF.
+    interfaces_removed = node_changed(conf, base + ['interface'])
+    if interfaces_removed:
+        isis['interface_removed'] = list(interfaces_removed)
+
+    # Bail out early if configuration tree does not exist
+    if not conf.exists(base):
+        isis.update({'deleted' : ''})
+        return isis
+
     return isis
 
 def verify(isis):
     # bail out early - looks like removal from running config
-    if not isis:
+    if not isis or 'deleted' in isis:
         return None
 
     if 'domain' not in isis:
@@ -53,6 +84,17 @@ def verify(isis):
     if 'interface' not in isis:
         raise ConfigError('Interface used for routing updates is mandatory!')
 
+    for interface in isis['interface']:
+        if 'vrf' in isis:
+            # If interface specific options are set, we must ensure that the
+            # interface is bound to our requesting VRF. Due to the VyOS
+            # priorities the interface is bound to the VRF after creation of
+            # the VRF itself, and before any routing protocol is configured.
+            vrf = isis['vrf']
+            tmp = get_interface_config(interface)
+            if 'master' not in tmp or tmp['master'] != vrf:
+                raise ConfigError(f'Interface {interface} is not a member of VRF {vrf}!')
+
     # If md5 and plaintext-password set at the same time
     if 'area_password' in isis:
         if {'md5', 'plaintext_password'} <= set(isis['encryption']):
@@ -111,7 +153,7 @@ def verify(isis):
     return None
 
 def generate(isis):
-    if not isis:
+    if not isis or 'deleted' in isis:
         isis['new_frr_config'] = ''
         return None
 
@@ -121,17 +163,29 @@ def generate(isis):
 def apply(isis):
     # Save original configuration prior to starting any commit actions
     frr_cfg = frr.FRRConfig()
-    frr_cfg.load_configuration(daemon='isisd')
-    frr_cfg.modify_section('^interface \S+$', '')
-    frr_cfg.modify_section('^router isis \S+$', '')
+    frr_cfg.load_configuration(frr_daemon)
+
+    # Generate empty helper string which can be ammended to FRR commands,
+    # it will be either empty (default VRF) or contain the "vrf <name" statement
+    vrf = ''
+    if 'vrf' in isis:
+        vrf = ' vrf ' + isis['vrf']
+
+    frr_cfg.modify_section(f'^router isis \S+{vrf}$', '')
+    for key in ['interface', 'interface_removed']:
+        if key not in isis:
+            continue
+        for interface in isis[key]:
+            frr_cfg.modify_section(f'^interface {interface}{vrf}$', '')
+
     frr_cfg.add_before(r'(ip prefix-list .*|route-map .*|line vty)', isis['new_frr_config'])
-    frr_cfg.commit_configuration(daemon='isisd')
+    frr_cfg.commit_configuration(frr_daemon)
 
     # If FRR config is blank, rerun the blank commit x times due to frr-reload
     # behavior/bug not properly clearing out on one commit.
     if isis['new_frr_config'] == '':
         for a in range(5):
-            frr_cfg.commit_configuration(daemon='isisd')
+            frr_cfg.commit_configuration(frr_daemon)
 
     return None