summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-02-11 20:35:31 +0100
committerChristian Poessinger <christian@poessinger.com>2021-02-11 20:35:31 +0100
commit8919e40a3c0b84053e422a8445a5fca829e5990f (patch)
treee41dfb54a0bfbe257a6df318960f755f3795614f /interface-definitions
parent66282cc8a5c8ced4dee8414e5fcb5cbaa457781f (diff)
downloadvyos-1x-8919e40a3c0b84053e422a8445a5fca829e5990f.tar.gz
vyos-1x-8919e40a3c0b84053e422a8445a5fca829e5990f.zip
ripng: T3281: move interface specific options to "protocols ripng"
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/include/rip-interface.xml.i47
-rw-r--r--interface-definitions/protocols-rip.xml.in51
2 files changed, 51 insertions, 47 deletions
diff --git a/interface-definitions/include/rip-interface.xml.i b/interface-definitions/include/rip-interface.xml.i
index 1d5e6f949..6279c16c8 100644
--- a/interface-definitions/include/rip-interface.xml.i
+++ b/interface-definitions/include/rip-interface.xml.i
@@ -14,53 +14,6 @@
</constraint>
</properties>
<children>
- <node name="authentication">
- <properties>
- <help>Authentication</help>
- </properties>
- <children>
- <tagNode name="md5">
- <properties>
- <help>MD5 key id</help>
- <valueHelp>
- <format>u32:1-255</format>
- <description>OSPF key id</description>
- </valueHelp>
- <constraint>
- <validator name="numeric" argument="--range 1-255"/>
- </constraint>
- </properties>
- <children>
- <leafNode name="password">
- <properties>
- <help>Authentication password</help>
- <valueHelp>
- <format>txt</format>
- <description>MD5 Key (16 characters or less)</description>
- </valueHelp>
- <constraint>
- <regex>^[^[:space:]]{1,16}$</regex>
- </constraint>
- <constraintErrorMessage>Password must be 16 characters or less</constraintErrorMessage>
- </properties>
- </leafNode>
- </children>
- </tagNode>
- <leafNode name="plaintext-password">
- <properties>
- <help>Plain text password</help>
- <valueHelp>
- <format>txt</format>
- <description>Plain text password (16 characters or less)</description>
- </valueHelp>
- <constraint>
- <regex>^[^[:space:]]{1,16}$</regex>
- </constraint>
- <constraintErrorMessage>Password must be 16 characters or less</constraintErrorMessage>
- </properties>
- </leafNode>
- </children>
- </node>
<node name="split-horizon">
<properties>
<help>Split horizon parameters</help>
diff --git a/interface-definitions/protocols-rip.xml.in b/interface-definitions/protocols-rip.xml.in
index 4ced26d8a..263350dc8 100644
--- a/interface-definitions/protocols-rip.xml.in
+++ b/interface-definitions/protocols-rip.xml.in
@@ -50,6 +50,57 @@
</children>
</node>
#include <include/rip-interface.xml.i>
+ <tagNode name="interface">
+ <children>
+ <node name="authentication">
+ <properties>
+ <help>Authentication</help>
+ </properties>
+ <children>
+ <tagNode name="md5">
+ <properties>
+ <help>MD5 key id</help>
+ <valueHelp>
+ <format>u32:1-255</format>
+ <description>OSPF key id</description>
+ </valueHelp>
+ <constraint>
+ <validator name="numeric" argument="--range 1-255"/>
+ </constraint>
+ </properties>
+ <children>
+ <leafNode name="password">
+ <properties>
+ <help>Authentication password</help>
+ <valueHelp>
+ <format>txt</format>
+ <description>MD5 Key (16 characters or less)</description>
+ </valueHelp>
+ <constraint>
+ <regex>^[^[:space:]]{1,16}$</regex>
+ </constraint>
+ <constraintErrorMessage>Password must be 16 characters or less</constraintErrorMessage>
+ </properties>
+ </leafNode>
+ </children>
+ </tagNode>
+ <leafNode name="plaintext-password">
+ <properties>
+ <help>Plain text password</help>
+ <valueHelp>
+ <format>txt</format>
+ <description>Plain text password (16 characters or less)</description>
+ </valueHelp>
+ <constraint>
+ <regex>^[^[:space:]]{1,16}$</regex>
+ </constraint>
+ <constraintErrorMessage>Password must be 16 characters or less</constraintErrorMessage>
+ </properties>
+ </leafNode>
+ </children>
+ </node>
+ </children>
+ </tagNode>
<leafNode name="neighbor">
<properties>
<help>Neighbor router</help>