2 files changed, 36 insertions, 17 deletions
diff --git a/interface-definitions/include/rip/version.xml.i b/interface-definitions/include/rip/version.xml.i
new file mode 100644
index 000000000..f7d3eab0d
--- /dev/null
+++ b/interface-definitions/include/rip/version.xml.i
@@ -0,0 +1,19 @@
+<!-- include start from rip/version.xml.i -->
+<leafNode name="version">
+  <properties>
+    <help>RIP protocol version</help>
+    <valueHelp>
+      <format>1</format>
+      <description>RIPv1</description>
+    </valueHelp>
+    <valueHelp>
+      <format>2</format>
+      <description>RIPv2</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-2"/>
+    </constraint>
+  </properties>
+  <defaultValue>2</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/protocols-rip.xml.in b/interface-definitions/protocols-rip.xml.in
index 500af51e5..2195b0316 100644
--- a/interface-definitions/protocols-rip.xml.in
+++ b/interface-definitions/protocols-rip.xml.in
@@ -98,6 +98,22 @@
                       <constraintErrorMessage>Password must be 16 characters or less</constraintErrorMessage>
                     </properties>
                   </leafNode>
+                  </children>
+              </node>
+              <node name="receive">
+                <properties>
+                  <help>Advertisement reception</help>
+                </properties>
+                <children>
+                  #include <include/rip/version.xml.i>
+                </children>
+              </node>
+              <node name="send">
+                <properties>
+                  <help>Advertisement transmission</help>
+                </properties>
+                <children>
+                  #include <include/rip/version.xml.i>
                 </children>
               </node>
             </children>
@@ -226,23 +242,7 @@
           </leafNode>
           #include <include/rip/timers.xml.i>
           #include <include/route-map.xml.i>
-          <leafNode name="version">
-            <properties>
-              <help>RIP protocol version</help>
-              <valueHelp>
-                <format>u32:1</format>
-                <description>RIPv1</description>
-              </valueHelp>
-              <valueHelp>
-                <format>u32:2</format>
-                <description>RIPv2</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 1-2"/>
-              </constraint>
-            </properties>
-            <defaultValue>2</defaultValue>
-          </leafNode>
+          #include <include/rip/version.xml.i>
         </children>
       </node>
     </children>