Merge pull request #800 from c-po/ospf-support-hyphen

protocols: fix "bad" design and non working route-maps containing hyphens

9 files changed, 15 insertions, 34 deletions

diff --git a/interface-definitions/include/bgp/bgp-common-config.xml.i b/interface-definitions/include/bgp/bgp-common-config.xml.i
index c89e2288e..14070e006 100644
--- a/interface-definitions/include/bgp/bgp-common-config.xml.i
+++ b/interface-definitions/include/bgp/bgp-common-config.xml.i
@@ -824,7 +824,6 @@
     #include <include/bgp/bgp-update-source.xml.i>

   </children>

 </tagNode>

-#include <include/route-map.xml.i>

 <node name="timers">

   <properties>

     <help>BGP protocol timers</help>

diff --git a/interface-definitions/include/isis/isis-redistribute-ipv4.xml.i b/interface-definitions/include/isis/isis-redistribute-ipv4.xml.i
index df48b4d28..15c8c0b0b 100644
--- a/interface-definitions/include/isis/isis-redistribute-ipv4.xml.i
+++ b/interface-definitions/include/isis/isis-redistribute-ipv4.xml.i
@@ -16,14 +16,7 @@
         </constraint>
       </properties>
     </leafNode>
-    <leafNode name="route-map">
-      <properties>
-        <help>Route map reference</help>
-        <completionHelp>
-          <path>policy route-map</path>
-        </completionHelp>
-      </properties>
-    </leafNode>
+    #include <include/route-map.xml.i>
   </children>
 </node>
 <node name="level-2">
@@ -43,14 +36,7 @@
         </constraint>
       </properties>
     </leafNode>
-    <leafNode name="route-map">
-      <properties>
-        <help>Route map reference</help>
-        <completionHelp>
-          <path>policy route-map</path>
-        </completionHelp>
-      </properties>
-    </leafNode>
+    #include <include/route-map.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/ospf/ospf-common-config.xml.i b/interface-definitions/include/ospf/ospf-common-config.xml.i
index 7316af670..a01d1c890 100644
--- a/interface-definitions/include/ospf/ospf-common-config.xml.i
+++ b/interface-definitions/include/ospf/ospf-common-config.xml.i
@@ -697,7 +697,6 @@
     </leafNode>
   </children>
 </node>
-#include <include/route-map.xml.i>
 <node name="timers">
   <properties>
     <help>Adjust routing timers</help>
diff --git a/interface-definitions/include/route-map.xml.i b/interface-definitions/include/route-map.xml.i
index 5a1c137b9..edbe76892 100644
--- a/interface-definitions/include/route-map.xml.i
+++ b/interface-definitions/include/route-map.xml.i
@@ -1,14 +1,18 @@
 <!-- include start from route-map.xml.i -->
 <leafNode name="route-map">
   <properties>
-    <help>Route map reference</help>
-    <valueHelp>
-      <format>txt</format>
-      <description>Route map reference</description>
-    </valueHelp>
+    <help>Specify route-map name to use</help>
     <completionHelp>
       <path>policy route-map</path>
     </completionHelp>
+    <valueHelp>
+      <format>txt</format>
+      <description>Route map name</description>
+    </valueHelp>
+    <constraint>
+      <regex>^[-a-zA-Z0-9.]+$</regex>
+    </constraint>
+    <constraintErrorMessage>Route-map name can only contain alpha-numeric letters and a hyphen</constraintErrorMessage>
   </properties>
 </leafNode>
 <!-- include end -->
diff --git a/interface-definitions/include/static/static-route-map.xml.i b/interface-definitions/include/static/static-route-map.xml.i
deleted file mode 100644
index af825e043..000000000
--- a/interface-definitions/include/static/static-route-map.xml.i
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- include start from static/static-route-map.xml.i -->
-<leafNode name="route-map">
-  <properties>
-    <help>Filter routes installed in local route map</help>
-    <completionHelp>
-      <path>policy route-map</path>
-    </completionHelp>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in
index d610f8dff..f4ebddb42 100644
--- a/interface-definitions/protocols-bgp.xml.in
+++ b/interface-definitions/protocols-bgp.xml.in
@@ -9,6 +9,7 @@
         </properties>
         <children>
           #include <include/bgp/bgp-common-config.xml.i>
+          #include <include/route-map.xml.i>
         </children>
       </node>
     </children>
diff --git a/interface-definitions/protocols-isis.xml.in b/interface-definitions/protocols-isis.xml.in
index 1bc890446..42d5049cc 100644
--- a/interface-definitions/protocols-isis.xml.in
+++ b/interface-definitions/protocols-isis.xml.in
@@ -9,6 +9,7 @@
         </properties>
         <children>
           #include <include/isis/isis-common-config.xml.i>
+          #include <include/route-map.xml.i>
         </children>
       </node>
     </children>
diff --git a/interface-definitions/protocols-ospf.xml.in b/interface-definitions/protocols-ospf.xml.in
index d9c3325ec..4431a1772 100644
--- a/interface-definitions/protocols-ospf.xml.in
+++ b/interface-definitions/protocols-ospf.xml.in
@@ -9,6 +9,7 @@
         </properties>
         <children>
           #include <include/ospf/ospf-common-config.xml.i>
+          #include <include/route-map.xml.i>
         </children>
       </node>
     </children>
diff --git a/interface-definitions/protocols-static.xml.in b/interface-definitions/protocols-static.xml.in
index baf13777a..3cc28e296 100644
--- a/interface-definitions/protocols-static.xml.in
+++ b/interface-definitions/protocols-static.xml.in
@@ -11,7 +11,7 @@
           <priority>480</priority>
         </properties>
         <children>
-          #include <include/static/static-route-map.xml.i>
+          #include <include/route-map.xml.i>
           #include <include/static/static-route.xml.i>
           #include <include/static/static-route6.xml.i>
           <tagNode name="table">