Merge branch 'current' of https://github.com/erkin/vyos-1x into current

7 files changed, 292 insertions, 235 deletions

diff --git a/interface-definitions/include/generic-disable-node.xml.i b/interface-definitions/include/generic-disable-node.xml.i
index bb4fa5c4b..97a328ecc 100644
--- a/interface-definitions/include/generic-disable-node.xml.i
+++ b/interface-definitions/include/generic-disable-node.xml.i
@@ -1,7 +1,7 @@
 <!-- include start from generic-disable-node.xml.i -->
 <leafNode name="disable">
   <properties>
-    <help>Temporary disable</help>
+    <help>Disable instance</help>
     <valueless/>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/listen-address-vrf.xml.i b/interface-definitions/include/listen-address-vrf.xml.i
new file mode 100644
index 000000000..7ec9eace4
--- /dev/null
+++ b/interface-definitions/include/listen-address-vrf.xml.i
@@ -0,0 +1,25 @@
+<!-- include start from listen-address-vrf.xml.i -->
+<tagNode name="listen-address">
+  <properties>
+    <help>Local IP addresses for service to listen on</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_local_ips.sh --both</script>
+    </completionHelp>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>IP address to listen for incoming connections</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv6</format>
+      <description>IPv6 address to listen for incoming connections</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv4-address"/>
+      <validator name="ipv6-address"/>
+    </constraint>
+  </properties>
+  <children>
+    #include <include/interface/vrf.xml.i>
+  </children>
+</tagNode>
+<!-- include end -->
diff --git a/interface-definitions/include/ospf/protocol-common-config.xml.i b/interface-definitions/include/ospf/protocol-common-config.xml.i
index 982e519a9..ac165a157 100644
--- a/interface-definitions/include/ospf/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospf/protocol-common-config.xml.i
@@ -436,6 +436,14 @@
         <constraintErrorMessage>Must be broadcast, non-broadcast, point-to-multipoint or point-to-point</constraintErrorMessage>
       </properties>
     </leafNode>
+    <node name="passive">
+      <properties>
+        <help>Suppress routing updates on an interface</help>
+      </properties>
+      <children>
+        #include <include/generic-disable-node.xml.i>
+      </children>
+    </node>
   </children>
 </tagNode>
 #include <include/ospf/log-adjacency-changes.xml.i>
@@ -597,26 +605,19 @@
     #include <include/router-id.xml.i>
   </children>
 </node>
-#include <include/routing-passive-interface.xml.i>
-<leafNode name="passive-interface-exclude">
+<leafNode name="passive-interface">
   <properties>
-    <help>Interface to exclude when using 'passive-interface default'</help>
+    <help>Suppress routing updates on an interface</help>
     <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces.py</script>
+      <list>default</list>
     </completionHelp>
     <valueHelp>
-      <format>txt</format>
-      <description>Interface to exclude when suppressing routing updates</description>
-    </valueHelp>
-    <valueHelp>
-      <format>vlinkN</format>
-      <description>Virtual-link interface to exclude when suppressing routing updates</description>
+      <format>default</format>
+      <description>Default to suppress routing updates on all interfaces</description>
     </valueHelp>
     <constraint>
-      <validator name="interface-name"/>
-      <regex>^(vlink[0-9]+)$</regex>
+      <regex>^(default)$</regex>
     </constraint>
-    <multi/>
   </properties>
 </leafNode>
 <node name="redistribute">
diff --git a/interface-definitions/include/ospfv3/protocol-common-config.xml.i b/interface-definitions/include/ospfv3/protocol-common-config.xml.i
new file mode 100644
index 000000000..a93939a34
--- /dev/null
+++ b/interface-definitions/include/ospfv3/protocol-common-config.xml.i
@@ -0,0 +1,241 @@
+<!-- include start from ospfv3/protocol-common-config.xml.i -->
+<tagNode name="area">
+  <properties>
+    <help>OSPFv3 Area</help>
+    <valueHelp>
+      <format>u32</format>
+      <description>Area ID as a decimal value</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>Area ID in IP address forma</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-4294967295"/>
+      <validator name="ip-address"/>
+    </constraint>
+  </properties>
+  <children>
+    <node name="area-type">
+      <properties>
+        <help>OSPFv3 Area type</help>
+      </properties>
+      <children>
+        <node name="stub">
+          <properties>
+            <help>Stub OSPFv3 area</help>
+          </properties>
+          <children>
+            <leafNode name="no-summary">
+              <properties>
+                <help>Do not inject inter-area routes into the stub</help>
+                <valueless/>
+              </properties>
+            </leafNode>
+          </children>
+        </node>
+      </children>
+    </node>
+    <leafNode name="export-list">
+      <properties>
+        <help>Name of export-list</help>
+        <completionHelp>
+          <path>policy access-list6</path>
+        </completionHelp>
+      </properties>
+    </leafNode>
+    <leafNode name="import-list">
+      <properties>
+        <help>Name of import-list</help>
+        <completionHelp>
+          <path>policy access-list6</path>
+        </completionHelp>
+      </properties>
+    </leafNode>
+    <tagNode name="range">
+      <properties>
+        <help>Specify IPv6 prefix (border routers only)</help>
+        <valueHelp>
+          <format>ipv6net</format>
+          <description>Specify IPv6 prefix (border routers only)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ipv6-prefix"/>
+        </constraint>
+      </properties>
+      <children>
+        <leafNode name="advertise">
+          <properties>
+            <help>Advertise this range</help>
+            <valueless/>
+          </properties>
+        </leafNode>
+        <leafNode name="not-advertise">
+          <properties>
+            <help>Do not advertise this range</help>
+            <valueless/>
+          </properties>
+        </leafNode>
+      </children>
+    </tagNode>
+  </children>
+</tagNode>
+<node name="distance">
+  <properties>
+    <help>Administrative distance</help>
+  </properties>
+  <children>
+    #include <include/ospf/distance-global.xml.i>
+    <node name="ospfv3">
+      <properties>
+        <help>OSPFv3 administrative distance</help>
+      </properties>
+      <children>
+        #include <include/ospf/distance-per-protocol.xml.i>
+      </children>
+    </node>
+  </children>
+</node>
+<tagNode name="interface">
+  <properties>
+    <help>Enable routing on an IPv6 interface</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_interfaces.py</script>
+    </completionHelp>
+    <valueHelp>
+      <format>txt</format>
+      <description>Interface used for routing information exchange</description>
+    </valueHelp>
+    <constraint>
+      <validator name="interface-name"/>
+    </constraint>
+  </properties>
+  <children>
+    <leafNode name="area">
+      <properties>
+        <help>Enable OSPF on this interface</help>
+        <completionHelp>
+          <path>protocols ospfv3 area</path>
+        </completionHelp>
+        <valueHelp>
+          <format>u32</format>
+          <description>OSPF area ID as decimal notation</description>
+        </valueHelp>
+        <valueHelp>
+          <format>ipv4</format>
+          <description>OSPF area ID in IP address notation</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-4294967295"/>
+          <validator name="ip-address"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    #include <include/ospf/intervals.xml.i>
+    #include <include/ospf/interface-common.xml.i>
+    <leafNode name="ifmtu">
+      <properties>
+        <help>Interface MTU</help>
+        <valueHelp>
+          <format>u32:1-65535</format>
+          <description>Interface MTU</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 1-65535"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="instance-id">
+      <properties>
+        <help>Instance Id (default: 0)</help>
+        <valueHelp>
+          <format>u32:0-255</format>
+          <description>Instance Id</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-255"/>
+        </constraint>
+      </properties>
+      <defaultValue>0</defaultValue>
+    </leafNode>
+    <leafNode name="network">
+      <properties>
+        <help>Network type</help>
+        <completionHelp>
+          <list>broadcast point-to-point</list>
+        </completionHelp>
+        <valueHelp>
+          <format>broadcast</format>
+          <description>Broadcast network type</description>
+        </valueHelp>
+        <valueHelp>
+          <format>point-to-point</format>
+          <description>Point-to-point network type</description>
+        </valueHelp>
+        <constraint>
+          <regex>^(broadcast|point-to-point)$</regex>
+        </constraint>
+        <constraintErrorMessage>Must be broadcast or point-to-point</constraintErrorMessage>
+      </properties>
+    </leafNode>
+    #include <include/isis/passive.xml.i>
+  </children>
+</tagNode>
+#include <include/ospf/log-adjacency-changes.xml.i>
+<node name="parameters">
+  <properties>
+    <help>OSPFv3 specific parameters</help>
+  </properties>
+  <children>
+    #include <include/router-id.xml.i>
+  </children>
+</node>
+<node name="redistribute">
+  <properties>
+    <help>Redistribute information from another routing protocol</help>
+  </properties>
+  <children>
+    <node name="bgp">
+      <properties>
+        <help>Redistribute BGP routes</help>
+      </properties>
+      <children>
+        #include <include/route-map.xml.i>
+      </children>
+    </node>
+    <node name="connected">
+      <properties>
+        <help>Redistribute connected routes</help>
+      </properties>
+      <children>
+        #include <include/route-map.xml.i>
+      </children>
+    </node>
+    <node name="kernel">
+      <properties>
+        <help>Redistribute kernel routes</help>
+      </properties>
+      <children>
+        #include <include/route-map.xml.i>
+      </children>
+    </node>
+    <node name="ripng">
+      <properties>
+        <help>Redistribute RIPNG routes</help>
+      </properties>
+      <children>
+        #include <include/route-map.xml.i>
+      </children>
+    </node>
+    <node name="static">
+      <properties>
+        <help>Redistribute static routes</help>
+      </properties>
+      <children>
+        #include <include/route-map.xml.i>
+      </children>
+    </node>
+  </children>
+</node>
+#include <include/route-map.xml.i>
+<!-- include end -->
diff --git a/interface-definitions/protocols-ospfv3.xml.in b/interface-definitions/protocols-ospfv3.xml.in
index fffeeb9a5..2b98ffa7b 100644
--- a/interface-definitions/protocols-ospfv3.xml.in
+++ b/interface-definitions/protocols-ospfv3.xml.in
@@ -8,226 +8,7 @@
           <priority>620</priority>
         </properties>
         <children>
-          <tagNode name="area">
-            <properties>
-              <help>OSPFv3 Area</help>
-              <valueHelp>
-                <format>u32</format>
-                <description>Area ID as a decimal value</description>
-              </valueHelp>
-              <valueHelp>
-                <format>ipv4</format>
-                <description>Area ID in IP address forma</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 0-4294967295"/>
-                <validator name="ip-address"/>
-              </constraint>
-            </properties>
-            <children>
-              <node name="area-type">
-                <properties>
-                  <help>OSPFv3 Area type</help>
-                </properties>
-                <children>
-                  <node name="stub">
-                    <properties>
-                      <help>Stub OSPFv3 area</help>
-                    </properties>
-                    <children>
-                      <leafNode name="no-summary">
-                        <properties>
-                          <help>Do not inject inter-area routes into the stub</help>
-                          <valueless/>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </node>
-                </children>
-              </node>
-              <leafNode name="export-list">
-                <properties>
-                  <help>Name of export-list</help>
-                  <completionHelp>
-                    <path>policy access-list6</path>
-                  </completionHelp>
-                </properties>
-              </leafNode>
-              <leafNode name="import-list">
-                <properties>
-                  <help>Name of import-list</help>
-                  <completionHelp>
-                    <path>policy access-list6</path>
-                  </completionHelp>
-                </properties>
-              </leafNode>
-              #include <include/generic-interface-multi.xml.i>
-              <tagNode name="range">
-                <properties>
-                  <help>Specify IPv6 prefix (border routers only)</help>
-                  <valueHelp>
-                    <format>ipv6net</format>
-                    <description>Specify IPv6 prefix (border routers only)</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ipv6-prefix"/>
-                  </constraint>
-                </properties>
-                <children>
-                  <leafNode name="advertise">
-                    <properties>
-                      <help>Advertise this range</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="not-advertise">
-                    <properties>
-                      <help>Do not advertise this range</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                </children>
-              </tagNode>
-            </children>
-          </tagNode>
-          <node name="distance">
-            <properties>
-              <help>Administrative distance</help>
-            </properties>
-            <children>
-              #include <include/ospf/distance-global.xml.i>
-              <node name="ospfv3">
-                <properties>
-                  <help>OSPFv3 administrative distance</help>
-                </properties>
-                <children>
-                  #include <include/ospf/distance-per-protocol.xml.i>
-                </children>
-              </node>
-            </children>
-          </node>
-          <tagNode name="interface">
-            <properties>
-              <help>Enable routing on an IPv6 interface</help>
-              <completionHelp>
-                <script>${vyos_completion_dir}/list_interfaces.py</script>
-              </completionHelp>
-              <valueHelp>
-                <format>txt</format>
-                <description>Interface used for routing information exchange</description>
-              </valueHelp>
-              <constraint>
-                <validator name="interface-name"/>
-              </constraint>
-            </properties>
-            <children>
-              #include <include/ospf/intervals.xml.i>
-              #include <include/ospf/interface-common.xml.i>
-              <leafNode name="ifmtu">
-                <properties>
-                  <help>Interface MTU</help>
-                  <valueHelp>
-                    <format>u32:1-65535</format>
-                    <description>Interface MTU</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-65535"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="instance-id">
-                <properties>
-                  <help>Instance Id (default: 0)</help>
-                  <valueHelp>
-                    <format>u32:0-255</format>
-                    <description>Instance Id</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 0-255"/>
-                  </constraint>
-                </properties>
-                <defaultValue>0</defaultValue>
-              </leafNode>
-              <leafNode name="network">
-                <properties>
-                  <help>Network type</help>
-                  <completionHelp>
-                    <list>broadcast point-to-point</list>
-                  </completionHelp>
-                  <valueHelp>
-                    <format>broadcast</format>
-                    <description>Broadcast network type</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>point-to-point</format>
-                    <description>Point-to-point network type</description>
-                  </valueHelp>
-                  <constraint>
-                    <regex>^(broadcast|point-to-point)$</regex>
-                  </constraint>
-                  <constraintErrorMessage>Must be broadcast or point-to-point</constraintErrorMessage>
-                </properties>
-              </leafNode>
-              #include <include/isis/passive.xml.i>
-            </children>
-          </tagNode>
-          #include <include/ospf/log-adjacency-changes.xml.i>
-          <node name="parameters">
-            <properties>
-              <help>OSPFv3 specific parameters</help>
-            </properties>
-            <children>
-              #include <include/router-id.xml.i>
-            </children>
-          </node>
-          <node name="redistribute">
-            <properties>
-              <help>Redistribute information from another routing protocol</help>
-            </properties>
-            <children>
-              <node name="bgp">
-                <properties>
-                  <help>Redistribute BGP routes</help>
-                </properties>
-                <children>
-                  #include <include/route-map.xml.i>
-                </children>
-              </node>
-              <node name="connected">
-                <properties>
-                  <help>Redistribute connected routes</help>
-                </properties>
-                <children>
-                  #include <include/route-map.xml.i>
-                </children>
-              </node>
-              <node name="kernel">
-                <properties>
-                  <help>Redistribute kernel routes</help>
-                </properties>
-                <children>
-                  #include <include/route-map.xml.i>
-                </children>
-              </node>
-              <node name="ripng">
-                <properties>
-                  <help>Redistribute RIPNG routes</help>
-                </properties>
-                <children>
-                  #include <include/route-map.xml.i>
-                </children>
-              </node>
-              <node name="static">
-                <properties>
-                  <help>Redistribute static routes</help>
-                </properties>
-                <children>
-                  #include <include/route-map.xml.i>
-                </children>
-              </node>
-            </children>
-          </node>
-          #include <include/route-map.xml.i>
+          #include <include/ospfv3/protocol-common-config.xml.i>
         </children>
       </node>
     </children>
diff --git a/interface-definitions/tftp-server.xml.in b/interface-definitions/tftp-server.xml.in
index 037c097ca..4963eab3c 100644
--- a/interface-definitions/tftp-server.xml.in
+++ b/interface-definitions/tftp-server.xml.in
@@ -24,7 +24,7 @@
           <leafNode name="port">
             <defaultValue>69</defaultValue>
           </leafNode>
-          #include <include/listen-address.xml.i>
+          #include <include/listen-address-vrf.xml.i>
         </children>
       </node>
     </children>
diff --git a/interface-definitions/vrf.xml.in b/interface-definitions/vrf.xml.in
index d6a602f53..14c31fa8a 100644
--- a/interface-definitions/vrf.xml.in
+++ b/interface-definitions/vrf.xml.in
@@ -60,6 +60,15 @@
                   #include <include/ospf/protocol-common-config.xml.i>
                 </children>
               </node>
+              <node name="ospfv3" owner="${vyos_conf_scripts_dir}/protocols_ospfv3.py $VAR(../../@)">
+                <properties>
+                  <help>Open Shortest Path First (OSPF) for IPv6</help>
+                  <priority>621</priority>
+                </properties>
+                <children>
+                  #include <include/ospfv3/protocol-common-config.xml.i>
+                </children>
+              </node>
               <node name="static" owner="${vyos_conf_scripts_dir}/protocols_static.py $VAR(../../@)">
                 <properties>
                   <help>Static route parameters</help>