Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed the BFD default detect multiplier to 10x #2614

Merged
merged 2 commits into from
Jan 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion orchagent/bfdorch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ using namespace swss;

#define BFD_SESSION_DEFAULT_TX_INTERVAL 1000
#define BFD_SESSION_DEFAULT_RX_INTERVAL 1000
#define BFD_SESSION_DEFAULT_DETECT_MULTIPLIER 3
#define BFD_SESSION_DEFAULT_DETECT_MULTIPLIER 10
#define BFD_SESSION_MILLISECOND_TO_MICROSECOND 1000
#define BFD_SRCPORTINIT 49152
#define BFD_SRCPORTMAX 65536
Expand Down
20 changes: 10 additions & 10 deletions tests/test_bfd.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def test_addRemoveBfdSession(self, dvs):

# Check STATE_DB entry related to the BFD session
expected_sdb_values = {"state": "Down", "type": "async_active", "local_addr" : "10.0.0.1", "tx_interval" :"1000",
"rx_interval" : "1000", "multiplier" : "3", "multihop": "false"}
"rx_interval" : "1000", "multiplier" : "10", "multihop": "false"}
self.check_state_bfd_session_value("default|default|10.0.0.2", expected_sdb_values)

# Send BFD session state notification to update BFD session state
Expand Down Expand Up @@ -108,7 +108,7 @@ def test_addRemoveBfdSession_ipv6(self, dvs):

# Check STATE_DB entry related to the BFD session
expected_sdb_values = {"state": "Down", "type": "async_active", "local_addr" : "2000::1", "tx_interval" :"1000",
"rx_interval" : "1000", "multiplier" : "3", "multihop": "false"}
"rx_interval" : "1000", "multiplier" : "10", "multihop": "false"}
self.check_state_bfd_session_value("default|default|2000::2", expected_sdb_values)

# Send BFD session state notification to update BFD session state
Expand Down Expand Up @@ -150,7 +150,7 @@ def test_addRemoveBfdSession_interface(self, dvs):

# Check STATE_DB entry related to the BFD session
expected_sdb_values = {"state": "Down", "type": "async_active", "local_addr" : "10.0.0.1", "tx_interval" :"1000",
"rx_interval" : "1000", "multiplier" : "3", "multihop": "false"}
"rx_interval" : "1000", "multiplier" : "10", "multihop": "false"}
self.check_state_bfd_session_value("default|Ethernet0|10.0.0.2", expected_sdb_values)

# Send BFD session state notification to update BFD session state
Expand Down Expand Up @@ -192,7 +192,7 @@ def test_addRemoveBfdSession_txrx_interval(self, dvs):

# Check STATE_DB entry related to the BFD session
expected_sdb_values = {"state": "Down", "type": "async_active", "local_addr" : "10.0.0.1", "tx_interval" :"300",
"rx_interval" : "500", "multiplier" : "3", "multihop": "false"}
"rx_interval" : "500", "multiplier" : "10", "multihop": "false"}
self.check_state_bfd_session_value("default|default|10.0.0.2", expected_sdb_values)

# Send BFD session state notification to update BFD session state
Expand Down Expand Up @@ -274,7 +274,7 @@ def test_addRemoveBfdSession_multihop(self, dvs):

# Check STATE_DB entry related to the BFD session
expected_sdb_values = {"state": "Down", "type": "async_active", "local_addr" : "10.0.0.1", "tx_interval" :"1000",
"rx_interval" : "1000", "multiplier" : "3", "multihop": "true"}
"rx_interval" : "1000", "multiplier" : "10", "multihop": "true"}
self.check_state_bfd_session_value("default|default|10.0.0.2", expected_sdb_values)

# Send BFD session state notification to update BFD session state
Expand Down Expand Up @@ -314,7 +314,7 @@ def test_addRemoveBfdSession_type(self, dvs):

# Check STATE_DB entry related to the BFD session
expected_sdb_values = {"state": "Down", "type": "demand_active", "local_addr" : "10.0.0.1", "tx_interval" :"1000",
"rx_interval" : "1000", "multiplier" : "3", "multihop": "false"}
"rx_interval" : "1000", "multiplier" : "10", "multihop": "false"}
self.check_state_bfd_session_value("default|default|10.0.0.2", expected_sdb_values)

# Send BFD session state notification to update BFD session state
Expand Down Expand Up @@ -357,7 +357,7 @@ def test_multipleBfdSessions(self, dvs):
# Check STATE_DB entry related to the BFD session 1
key_state_db1 = "default|default|10.0.0.2"
expected_sdb_values1 = {"state": "Down", "type": "async_active", "local_addr" : "10.0.0.1", "tx_interval" :"1000",
"rx_interval" : "1000", "multiplier" : "3", "multihop": "false"}
"rx_interval" : "1000", "multiplier" : "10", "multihop": "false"}
self.check_state_bfd_session_value(key_state_db1, expected_sdb_values1)

# Create BFD session 2
Expand Down Expand Up @@ -385,7 +385,7 @@ def test_multipleBfdSessions(self, dvs):
# Check STATE_DB entry related to the BFD session 2
key_state_db2 = "default|default|10.0.1.2"
expected_sdb_values2 = {"state": "Down", "type": "async_active", "local_addr" : "10.0.0.1", "tx_interval" :"300",
"rx_interval" : "500", "multiplier" : "3", "multihop": "false"}
"rx_interval" : "500", "multiplier" : "10", "multihop": "false"}
self.check_state_bfd_session_value(key_state_db2, expected_sdb_values2)

# Create BFD session 3
Expand All @@ -411,7 +411,7 @@ def test_multipleBfdSessions(self, dvs):
# Check STATE_DB entry related to the BFD session 3
key_state_db3 = "default|default|2000::2"
expected_sdb_values3 = {"state": "Down", "type": "demand_active", "local_addr" : "2000::1", "tx_interval" :"1000",
"rx_interval" : "1000", "multiplier" : "3", "multihop": "false"}
"rx_interval" : "1000", "multiplier" : "10", "multihop": "false"}
self.check_state_bfd_session_value(key_state_db3, expected_sdb_values3)

# Create BFD session 4
Expand All @@ -437,7 +437,7 @@ def test_multipleBfdSessions(self, dvs):
# Check STATE_DB entry related to the BFD session 4
key_state_db4 = "default|default|3000::2"
expected_sdb_values4 = {"state": "Down", "type": "async_active", "local_addr" : "3000::1", "tx_interval" :"1000",
"rx_interval" : "1000", "multiplier" : "3", "multihop": "false"}
"rx_interval" : "1000", "multiplier" : "10", "multihop": "false"}
self.check_state_bfd_session_value(key_state_db4, expected_sdb_values4)

# Update BFD session states
Expand Down