From 050f44ef1fba3cc23934a65df59ab3d1181cb5d0 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 16 Feb 2021 18:58:21 +0100
Subject: ospfv3: T3313: move interface related options to "protocols ospfv3
 interface"

---
 interface-definitions/protocols-ospfv3.xml.in | 130 +++++++++++++++-----------
 1 file changed, 73 insertions(+), 57 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/protocols-ospfv3.xml.in b/interface-definitions/protocols-ospfv3.xml.in
index e28faa3cf..2559e2b03 100644
--- a/interface-definitions/protocols-ospfv3.xml.in
+++ b/interface-definitions/protocols-ospfv3.xml.in
@@ -41,7 +41,7 @@
                   </completionHelp>
                 </properties>
               </leafNode>
-              <tagNode name="interface">
+              <leafNode name="interface">
                 <properties>
                   <help>Enable routing on an IPv6 interface</help>
                   <completionHelp>
@@ -54,63 +54,9 @@
                   <constraint>
                     <validator name="interface-name"/>
                   </constraint>
+                  <multi/>
                 </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>
-                  <leafNode name="passive">
-                    <properties>
-                      <help>Disable forming of adjacency</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                </children>
-              </tagNode>
+              </leafNode>
               <tagNode name="range">
                 <properties>
                   <help>Specify IPv6 prefix (border routers only)</help>
@@ -201,6 +147,76 @@
               </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>
+              <leafNode name="passive">
+                <properties>
+                  <help>Disable forming of adjacency</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+            </children>
+          </tagNode>
           <node name="parameters">
             <properties>
               <help>OSPFv3 specific parameters</help>
-- 
cgit v1.2.3