Merge pull request #691 from sever-sever/T3236

ospf: T3236: Add XML for new format ospf conf-mode

Makefile

@@ -47,7 +47,7 @@ interface_definitions: $(config_xml_obj)
 	rm -f $(TMPL_DIR)/vpn/node.def
 	rm -f $(TMPL_DIR)/vpn/ipsec/node.def
 	rm -rf $(TMPL_DIR)/vpn/nipsec
-	rm -rf $(TMPL_DIR)/vpn/nospf
+	rm -rf $(TMPL_DIR)/protocols/nospf
 
 	# XXX: required until OSPF and RIP is migrated from vyatta-cfg-quagga to vyos-1x
 	mkdir $(TMPL_DIR)/interfaces/loopback/node.tag/ipv6

interface-definitions/include/ospf-metric.xml.i

@@ -0,0 +1,33 @@
+<!-- included start from ospf-metric.xml.i -->
+<leafNode name="metric">
+  <properties>
+    <help>OSPF default metric</help>
+    <valueHelp>
+      <format>u32:0-16777214</format>
+      <description>Default metric</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-16777214"/>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="metric-type">
+  <properties>
+    <help>OSPF metric type for default routes</help>
+    <valueHelp>
+      <format>u32:1-2</format>
+      <description>Metric type for default routes (default 2)</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-2"/>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="route-map">
+  <properties>
+    <help>Route map reference</help>
+    <completionHelp>
+      <path>policy route-map</path>
+    </completionHelp>
+  </properties>
+</leafNode>