diff --git a/orchagent/bfdorch.cpp b/orchagent/bfdorch.cpp index 863fde59ed..f242645b35 100644 --- a/orchagent/bfdorch.cpp +++ b/orchagent/bfdorch.cpp @@ -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 diff --git a/tests/test_bfd.py b/tests/test_bfd.py index 2feef60acb..bd1592f536 100644 --- a/tests/test_bfd.py +++ b/tests/test_bfd.py @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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