ospf: T3267: move "interface ip ospf" configuration to "protocols ospf interface"

For easier maintenance and operability move the interface specific protocol
setting of OSPF to the OSPF protocol section. This is now also in-line with IS-IS.

This means to migrate:
 ethernet eth0 {
    vif 202 {
        ip {
            ospf {
                authentication {
                    md5 {
                        key-id 10 {
                            md5-key vyosvyos
                        }
                    }
                }
                dead-interval 40
                hello-interval 10
                priority 1
                retransmit-interval 5
                transmit-delay 1
            }
        }
    }
 }

to

 protocols {
    ospf {
        interface eth0.201 {
            authentication {
                md5 {
                    key-id 10 {
                        md5-key vyosvyos
                    }
                }
            }
            dead-interval 40
            hello-interval 10
            priority 1
            retransmit-interval 5
            transmit-delay 1
        }
 }

3 files changed, 190 insertions, 95 deletions

diff --git a/interface-definitions/include/ospf-authentication.xml.i b/interface-definitions/include/ospf-authentication.xml.i
new file mode 100644
index 000000000..0963e5cc0
--- /dev/null
+++ b/interface-definitions/include/ospf-authentication.xml.i
@@ -0,0 +1,45 @@
+<!-- included start from ospf-authentication.xml.i -->
+<node name="authentication">
+  <properties>
+    <help>Authentication</help>
+  </properties>
+  <children>
+    <node name="md5">
+      <properties>
+        <help>MD5 key id</help>
+      </properties>
+      <children>
+        <tagNode name="key-id">
+          <properties>
+            <help>MD5 key id</help>
+            <valueHelp>
+              <format>u32:1-255</format>
+              <description>MD5 key id</description>
+            </valueHelp>
+          </properties>
+          <children>
+            <leafNode name="md5-key">
+              <properties>
+                <help>MD5 authentication type</help>
+                <valueHelp>
+                  <format>txt</format>
+                  <description>MD5 Key (16 characters or less)</description>
+                </valueHelp>
+              </properties>
+            </leafNode>
+          </children>
+        </tagNode>
+      </children>
+    </node>
+    <leafNode name="plaintext-password">
+      <properties>
+        <help>Plain text password</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>Plain text password (8 characters or less)</description>
+        </valueHelp>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- included end -->
diff --git a/interface-definitions/include/ospf-intervals.xml.i b/interface-definitions/include/ospf-intervals.xml.i
new file mode 100644
index 000000000..e532bd14b
--- /dev/null
+++ b/interface-definitions/include/ospf-intervals.xml.i
@@ -0,0 +1,54 @@
+<!-- included start from ospf-intervals.xml.i -->
+<leafNode name="dead-interval">
+  <properties>
+    <help>Interval after which a neighbor is declared dead (default: 40)</help>
+    <valueHelp>
+      <format>u32:1-65535</format>
+      <description>Neighbor dead interval (seconds)</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-65535"/>
+    </constraint>
+  </properties>
+  <defaultValue>40</defaultValue>
+</leafNode>
+<leafNode name="hello-interval">
+  <properties>
+    <help>Interval between hello packets (default: 10)</help>
+    <valueHelp>
+      <format>u32:1-65535</format>
+      <description>Hello interval (seconds)</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-65535"/>
+    </constraint>
+  </properties>
+  <defaultValue>10</defaultValue>
+</leafNode>
+<leafNode name="retransmit-interval">
+  <properties>
+    <help>Interval between retransmitting lost link state advertisements (default: 5)</help>
+    <valueHelp>
+      <format>u32:1-65535</format>
+      <description>Retransmit interval (seconds)</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-65535"/>
+    </constraint>
+  </properties>
+  <defaultValue>5</defaultValue>
+</leafNode>
+<leafNode name="transmit-delay">
+  <properties>
+    <help>Link state transmit delay (default: 1)</help>
+    <valueHelp>
+      <format>u32:1-65535</format>
+      <description>Link state transmit delay (seconds)</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-65535"/>
+    </constraint>
+  </properties>
+  <defaultValue>1</defaultValue>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/protocols-ospf.xml.in b/interface-definitions/protocols-ospf.xml.in
index 074d0db63..1051e3741 100644
--- a/interface-definitions/protocols-ospf.xml.in
+++ b/interface-definitions/protocols-ospf.xml.in
@@ -275,101 +275,8 @@
                   </constraint>
                 </properties>
                 <children>
-                  <node name="authentication">
-                    <properties>
-                      <help>Authentication</help>
-                    </properties>
-                    <children>
-                      <node name="md5">
-                        <properties>
-                          <help>MD5 key id</help>
-                        </properties>
-                        <children>
-                          <tagNode name="key-id">
-                            <properties>
-                              <help>MD5 key id</help>
-                              <valueHelp>
-                                <format>u32:1-255</format>
-                                <description>MD5 key id</description>
-                              </valueHelp>
-                            </properties>
-                            <children>
-                              <leafNode name="md5-key">
-                                <properties>
-                                  <help>MD5 authentication type</help>
-                                  <valueHelp>
-                                    <format>txt</format>
-                                    <description>MD5 Key (16 characters or less)</description>
-                                  </valueHelp>
-                                </properties>
-                              </leafNode>
-                            </children>
-                          </tagNode>
-                        </children>
-                      </node>
-                      <leafNode name="plaintext-password">
-                        <properties>
-                          <help>Plain text password</help>
-                          <valueHelp>
-                            <format>txt</format>
-                            <description>Plain text password (8 characters or less)</description>
-                          </valueHelp>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </node>
-                  <leafNode name="dead-interval">
-                    <properties>
-                      <help>Interval after which a neighbor is declared dead (default: 40)</help>
-                      <valueHelp>
-                        <format>u32:1-65535</format>
-                        <description>Neighbor dead interval (seconds)</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 1-65535"/>
-                      </constraint>
-                    </properties>
-                    <defaultValue>40</defaultValue>
-                  </leafNode>
-                  <leafNode name="hello-interval">
-                    <properties>
-                      <help>Interval between hello packets (default: 10)</help>
-                      <valueHelp>
-                        <format>u32:1-65535</format>
-                        <description>Hello interval (seconds)</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 1-65535"/>
-                      </constraint>
-                    </properties>
-                    <defaultValue>10</defaultValue>
-                  </leafNode>
-                  <leafNode name="retransmit-interval">
-                    <properties>
-                      <help>Interval between retransmitting lost link state advertisements (default: 5)</help>
-                      <valueHelp>
-                        <format>u32:1-65535</format>
-                        <description>Retransmit interval (seconds)</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 1-65535"/>
-                      </constraint>
-                    </properties>
-                    <defaultValue>5</defaultValue>
-                  </leafNode>
-                  <leafNode name="transmit-delay">
-                    <properties>
-                      <help>Link state transmit delay (default: 1)</help>
-                      <valueHelp>
-                        <format>u32:1-65535</format>
-                        <description>Link state transmit delay (seconds)</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 1-65535"/>
-                      </constraint>
-                    </properties>
-                    <defaultValue>1</defaultValue>
-                  </leafNode>
+                  #include <include/ospf-authentication.xml.i>
+                  #include <include/ospf-intervals.xml.i>
                 </children>
               </tagNode>
             </children>
@@ -491,6 +398,95 @@
               </node>
             </children>
           </node>
+          <tagNode name="interface">
+            <properties>
+              <help>Interface related configuration</help>
+              <completionHelp>
+                <script>${vyos_completion_dir}/list_interfaces.py</script>
+              </completionHelp>
+            </properties>
+            <children>
+              #include <include/ospf-authentication.xml.i>
+              #include <include/ospf-intervals.xml.i>
+              <leafNode name="bandwidth">
+                <properties>
+                  <help>Bandwidth of interface (Megabit/sec)</help>
+                  <valueHelp>
+                    <format>u32:1-100000</format>
+                    <description>Bandwidth in Megabit/sec (for calculating OSPF cost)</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 1-100000"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <leafNode name="bfd">
+                <properties>
+                  <help>Enable Bidirectional Forwarding Detection (BFD) support</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+              <leafNode name="cost">
+                <properties>
+                  <help>Interface cost</help>
+                  <valueHelp>
+                    <format>u32:1-65535</format>
+                    <description>OSPF interface cost</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 1-65535"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <leafNode name="mtu-ignore">
+                <properties>
+                  <help>Disable Maximum Transmission Unit (MTU) mismatch detection</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+              <leafNode name="network">
+                <properties>
+                  <help>Network type</help>
+                  <completionHelp>
+                    <list>broadcast non-broadcast point-to-multipoint point-to-point</list>
+                  </completionHelp>
+                  <valueHelp>
+                    <format>broadcast</format>
+                    <description>Broadcast network type</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>non-broadcast</format>
+                    <description>Non-broadcast network type</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>point-to-multipoint</format>
+                    <description>Point-to-multipoint network type</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>point-to-point</format>
+                    <description>Point-to-point network type</description>
+                  </valueHelp>
+                  <constraint>
+                    <regex>^(broadcast|non-broadcast|point-to-multipoint|point-to-point)$</regex>
+                  </constraint>
+                  <constraintErrorMessage>Must be broadcast, non-broadcast, point-to-multipoint or point-to-point</constraintErrorMessage>
+                </properties>
+              </leafNode>
+              <leafNode name="priority">
+                <properties>
+                  <help>Router priority (default: 1)</help>
+                  <valueHelp>
+                    <format>u32:0-255</format>
+                    <description>OSPF router priority cost</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 0-255"/>
+                  </constraint>
+                </properties>
+                <defaultValue>1</defaultValue>
+              </leafNode>
+            </children>
+          </tagNode>
           <node name="log-adjacency-changes">
             <properties>
               <help>Log changes in adjacency state</help>