3 files changed, 26 insertions, 2 deletions
diff --git a/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i b/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i
index fb46f2c09..cca824d89 100644
--- a/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i
+++ b/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i
@@ -21,7 +21,7 @@
       <description>Dynamic Host Configuration Protocol for IPv6</description>
     </valueHelp>
     <constraint>
-      <validator name="ip-cidr"/>
+      <validator name="ip-host"/>
       <regex>(dhcp|dhcpv6)</regex>
     </constraint>
     <multi/>
diff --git a/interface-definitions/include/address-ipv4-ipv6.xml.i b/interface-definitions/include/address-ipv4-ipv6.xml.i
index aa84a5640..a891085bd 100644
--- a/interface-definitions/include/address-ipv4-ipv6.xml.i
+++ b/interface-definitions/include/address-ipv4-ipv6.xml.i
@@ -10,7 +10,7 @@
       <description>IPv6 address and prefix length</description>
     </valueHelp>
     <constraint>
-      <validator name="ip-cidr"/>
+      <validator name="ip-host"/>
     </constraint>
     <multi/>
   </properties>
diff --git a/interface-definitions/include/rip-redistribute.xml.i b/interface-definitions/include/rip-redistribute.xml.i
new file mode 100644
index 000000000..d94dfa5a8
--- /dev/null
+++ b/interface-definitions/include/rip-redistribute.xml.i
@@ -0,0 +1,24 @@
+<leafNode name="metric">
+  <properties>
+    <help>Metric for redistributed routes</help>
+    <valueHelp>
+      <format>&lt;1-16&gt;</format>
+      <description>Redistribute route metric</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-16"/>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="route-map">
+  <properties>
+    <help>Route map reference</help>
+    <valueHelp>
+      <format>&lt;text&gt;</format>
+      <description>Route map reference</description>
+    </valueHelp>
+    <completionHelp>
+      <path>policy route-map</path>
+    </completionHelp>
+  </properties>
+</leafNode>