summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--interface-definitions/protocols-bfd.xml24
-rwxr-xr-xsrc/conf_mode/protocols_bfd.py12
2 files changed, 18 insertions, 18 deletions
diff --git a/interface-definitions/protocols-bfd.xml b/interface-definitions/protocols-bfd.xml
index 0e92a7ddd..47d5bf97d 100644
--- a/interface-definitions/protocols-bfd.xml
+++ b/interface-definitions/protocols-bfd.xml
@@ -50,18 +50,6 @@
</leafNode>
</children>
</node>
- <leafNode name="multiplier">
- <properties>
- <help>Multiplier to determine packet loss</help>
- <valueHelp>
- <format>2-255</format>
- <description>Remote transmission interval will be multiplied by this value</description>
- </valueHelp>
- <constraint>
- <validator name="numeric" argument="--range 2-255"/>
- </constraint>
- </properties>
- </leafNode>
<node name="interval">
<properties>
<help>Configure timer intervals</help>
@@ -91,6 +79,18 @@
</constraint>
</properties>
</leafNode>
+ <leafNode name="multiplier">
+ <properties>
+ <help>Multiplier to determine packet loss</help>
+ <valueHelp>
+ <format>2-255</format>
+ <description>Remote transmission interval will be multiplied by this value</description>
+ </valueHelp>
+ <constraint>
+ <validator name="numeric" argument="--range 2-255"/>
+ </constraint>
+ </properties>
+ </leafNode>
</children>
</node>
<leafNode name="shutdown">
diff --git a/src/conf_mode/protocols_bfd.py b/src/conf_mode/protocols_bfd.py
index 2f494c2e4..04549f4b4 100755
--- a/src/conf_mode/protocols_bfd.py
+++ b/src/conf_mode/protocols_bfd.py
@@ -87,12 +87,6 @@ def get_config():
if conf.exists('source address'):
bfd_peer['src_addr'] = conf.return_value('source address')
- # Configures the detection multiplier to determine packet loss. The remote
- # transmission interval will be multiplied by this value to determine the
- # connection loss detection timer. The default value is 3.
- if conf.exists('multiplier'):
- bfd_peer['multiplier'] = conf.return_value('multiplier')
-
# Tell BFD daemon that we should expect packets with TTL less than 254
# (because it will take more than one hop) and to listen on the multihop
# port (4784)
@@ -109,6 +103,12 @@ def get_config():
if conf.exists('interval transmit'):
bfd_peer['tx_interval'] = conf.return_value('interval transmit')
+ # Configures the detection multiplier to determine packet loss. The remote
+ # transmission interval will be multiplied by this value to determine the
+ # connection loss detection timer. The default value is 3.
+ if conf.exists('interval multiplier'):
+ bfd_peer['multiplier'] = conf.return_value('interval multiplier')
+
bfd['new_peers'].append(bfd_peer)
return bfd