openstack/neutron
Code Issues Proposed changes

[FT] Reduce arping interval in `test_send_ipv4_addr_adv_notif`

Browse Source 
Closes-Bug: #2095044
Change-Id: I990368d7b76cc5fcb29e5ef325d19c1b1fc53ccd
This commit is contained in:
Rodolfo Alonso Hernandez
2025-01-16 11:16:34 +00:00
committed by Rodolfo Alonso
parent 90e29e852e
commit d5404549bb
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/agent/linux/ip_lib.py
View File

@@ -86,6 +86,8 @@ DEVICE_NAME_PATTERN = re.compile(r"(\d+?): (\S+?):.*")
IP_ROUTE_METRIC_DEFAULT = {constants.IP_VERSION_4: 0, IP_ROUTE_METRIC_DEFAULT = {constants.IP_VERSION_4: 0,
constants.IP_VERSION_6: 1024} constants.IP_VERSION_6: 1024}
ARPING_SLEEP = 2
def remove_interface_suffix(interface): def remove_interface_suffix(interface):
"""Remove a possible "<if>@<endpoint>" suffix from an interface' name. """Remove a possible "<if>@<endpoint>" suffix from an interface' name.
@@ -1060,7 +1062,7 @@ def _arping(ns_name, iface_name, address, count, log_exception):
for i in range(count): for i in range(count):
if not first: if not first:
# hopefully enough for kernel to get out of locktime loop # hopefully enough for kernel to get out of locktime loop
time.sleep(2) time.sleep(ARPING_SLEEP)
# On the second (and subsequent) arping calls, we can get a # On the second (and subsequent) arping calls, we can get a
# "bind: Cannot assign requested address" error since # "bind: Cannot assign requested address" error since
# the IP address might have been deleted concurrently. # the IP address might have been deleted concurrently.

1
neutron/tests/unit/agent/linux/test_ip_lib.py
View File

@@ -1078,6 +1078,7 @@ class TestIpNeighCommand(TestIPCmdBase):
class TestArpPing(TestIPCmdBase): class TestArpPing(TestIPCmdBase):
@mock.patch.object(ip_lib, 'ARPING_SLEEP', 0)
@mock.patch.object(ip_lib, 'IPWrapper') @mock.patch.object(ip_lib, 'IPWrapper')
@mock.patch('eventlet.spawn_n') @mock.patch('eventlet.spawn_n')
def test_send_ipv4_addr_adv_notif(self, spawn_n, mIPWrapper): def test_send_ipv4_addr_adv_notif(self, spawn_n, mIPWrapper):