diff options
author | Daniil Baturin <daniil@vyos.io> | 2021-02-22 17:04:15 +0200 |
---|---|---|
committer | Daniil Baturin <daniil@vyos.io> | 2021-02-22 17:04:15 +0200 |
commit | bdc35ac8ad1d3d88c796aa488749e44bda617b44 (patch) | |
tree | b2c97b7ab02aa6c3c3ed27cb98e46302f797c909 /interface-definitions/protocols-ospf.xml.in | |
parent | 28cd2e3edb3e2108c43ad20c0084d496a7ffef25 (diff) | |
parent | cf1156a60e1d03a752cde0baadbc9ac8118b2a52 (diff) | |
download | vyos-1x-bdc35ac8ad1d3d88c796aa488749e44bda617b44.tar.gz vyos-1x-bdc35ac8ad1d3d88c796aa488749e44bda617b44.zip |
Merge branch 'current' of https://github.com/vyos/vyos-1x into current
Diffstat (limited to 'interface-definitions/protocols-ospf.xml.in')
-rw-r--r-- | interface-definitions/protocols-ospf.xml.in | 45 |
1 files changed, 7 insertions, 38 deletions
diff --git a/interface-definitions/protocols-ospf.xml.in b/interface-definitions/protocols-ospf.xml.in index a616c0e60..4c480c71d 100644 --- a/interface-definitions/protocols-ospf.xml.in +++ b/interface-definitions/protocols-ospf.xml.in @@ -415,6 +415,7 @@ <children> #include <include/ospf-authentication.xml.i> #include <include/ospf-intervals.xml.i> + #include <include/ospf-interface-common.xml.i> <leafNode name="bandwidth"> <properties> <help>Bandwidth of interface (Megabit/sec)</help> @@ -427,24 +428,6 @@ </constraint> </properties> </leafNode> - <leafNode name="bfd"> - <properties> - <help>Enable Bidirectional Forwarding Detection (BFD) support</help> - <valueless/> - </properties> - </leafNode> - <leafNode name="cost"> - <properties> - <help>Interface cost</help> - <valueHelp> - <format>u32:1-65535</format> - <description>OSPF interface cost</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1-65535"/> - </constraint> - </properties> - </leafNode> <leafNode name="hello-multiplier"> <properties> <help>Hello multiplier factor</help> @@ -457,12 +440,6 @@ </constraint> </properties> </leafNode> - <leafNode name="mtu-ignore"> - <properties> - <help>Disable Maximum Transmission Unit (MTU) mismatch detection</help> - <valueless/> - </properties> - </leafNode> <leafNode name="network"> <properties> <help>Network type</help> @@ -491,19 +468,6 @@ <constraintErrorMessage>Must be broadcast, non-broadcast, point-to-multipoint or point-to-point</constraintErrorMessage> </properties> </leafNode> - <leafNode name="priority"> - <properties> - <help>Router priority (default: 1)</help> - <valueHelp> - <format>u32:0-255</format> - <description>OSPF router priority cost</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 0-255"/> - </constraint> - </properties> - <defaultValue>1</defaultValue> - </leafNode> </children> </tagNode> <node name="log-adjacency-changes"> @@ -697,10 +661,15 @@ </completionHelp> <valueHelp> <format>txt</format> - <description>Interface to be passive (i.e. suppress routing updates)</description> + <description>Interface to exclude when suppressing routing updates</description> + </valueHelp> + <valueHelp> + <format>vlinkN</format> + <description>Virtual-link interface to exclude when suppressing routing updates</description> </valueHelp> <constraint> <validator name="interface-name"/> + <regex>^(vlink[0-9]+)$</regex> </constraint> <multi/> </properties> |