summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-02-06 10:48:54 +0100
committerChristian Poessinger <christian@poessinger.com>2021-02-06 10:52:50 +0100
commitddb793fe29ee1847a8f4e7defe066a140a6ae892 (patch)
tree8653e626044d83a9dbb1b30070c3b120e5224fb6
parentc97a196c75f556105c02c43de3cc6719e8dfe559 (diff)
downloadvyos-1x-ddb793fe29ee1847a8f4e7defe066a140a6ae892.tar.gz
vyos-1x-ddb793fe29ee1847a8f4e7defe066a140a6ae892.zip
xml: rip: ospf: add passive-interface building block
-rw-r--r--interface-definitions/include/routing-passive-interface-xml.i24
-rw-r--r--interface-definitions/protocols-ospf.xml.in23
-rw-r--r--interface-definitions/protocols-rip.xml.in19
3 files changed, 26 insertions, 40 deletions
diff --git a/interface-definitions/include/routing-passive-interface-xml.i b/interface-definitions/include/routing-passive-interface-xml.i
new file mode 100644
index 000000000..8478620cf
--- /dev/null
+++ b/interface-definitions/include/routing-passive-interface-xml.i
@@ -0,0 +1,24 @@
+<!-- included start from routing-passive-interface-xml.i -->
+<leafNode name="passive-interface">
+ <properties>
+ <help>Suppress routing updates on an interface</help>
+ <completionHelp>
+ <list>default</list>
+ <script>${vyos_completion_dir}/list_interfaces.py</script>
+ </completionHelp>
+ <valueHelp>
+ <format>txt</format>
+ <description>Interface to be passive (i.e. suppress routing updates)</description>
+ </valueHelp>
+ <valueHelp>
+ <format>default</format>
+ <description>Default to suppress routing updates on all interfaces</description>
+ </valueHelp>
+ <constraint>
+ <regex>^(default)$</regex>
+ <validator name="interface-name"/>
+ </constraint>
+ <multi/>
+ </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/protocols-ospf.xml.in b/interface-definitions/protocols-ospf.xml.in
index ca848c289..ee350fb17 100644
--- a/interface-definitions/protocols-ospf.xml.in
+++ b/interface-definitions/protocols-ospf.xml.in
@@ -681,28 +681,7 @@
</leafNode>
</children>
</node>
- <leafNode name="passive-interface">
- <properties>
- <help>Suppress routing updates on an interface</help>
- <completionHelp>
- <list>default</list>
- <script>${vyos_completion_dir}/list_interfaces.py</script>
- </completionHelp>
- <valueHelp>
- <format>txt</format>
- <description>Interface to be passive (i.e. suppress routing updates)</description>
- </valueHelp>
- <valueHelp>
- <format>default</format>
- <description>Default to suppress routing updates on all interfaces</description>
- </valueHelp>
- <constraint>
- <regex>^(default)$</regex>
- <validator name="interface-name"/>
- </constraint>
- <multi/>
- </properties>
- </leafNode>
+ #include <include/routing-passive-interface-xml.i>
<leafNode name="passive-interface-exclude">
<properties>
<help>Interface to exclude when using 'passive-interface default'</help>
diff --git a/interface-definitions/protocols-rip.xml.in b/interface-definitions/protocols-rip.xml.in
index 385784f92..c91d2c66b 100644
--- a/interface-definitions/protocols-rip.xml.in
+++ b/interface-definitions/protocols-rip.xml.in
@@ -135,24 +135,7 @@
#include <include/static-route-distance.xml.i>
</children>
</tagNode>
- <leafNode name="passive-interface">
- <properties>
- <help>Passive interface</help>
- <valueHelp>
- <format>txt</format>
- <description>Suppress routing updates on interface</description>
- </valueHelp>
- <valueHelp>
- <format>default</format>
- <description>Suppress routing updates on all interfaces by default</description>
- </valueHelp>
- <completionHelp>
- <list>default</list>
- <script>${vyos_completion_dir}/list_interfaces.py</script>
- </completionHelp>
- <multi/>
- </properties>
- </leafNode>
+ #include <include/routing-passive-interface-xml.i>
<node name="redistribute">
<properties>
<help>Redistribute information from another routing protocol</help>