Skip to content

Commit 8d5a2f5

Browse files
Remove packets_for_test fixture dependency for proxy arp enabled (sonic-net#21803)
* Remove packets_for_test fixture dependency for proxy arp enabled Fixing issue: sonic-net#21801 Determine the ip version from the test name to remove teh dependency on packets_for_test. Signed-off-by: Justin Wong <jvwong@arista.com>
1 parent 8120264 commit 8d5a2f5

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

tests/arp/conftest.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ def ip_and_intf_info(config_facts, intfs_for_test, ptfhost, ptfadapter):
282282

283283

284284
@pytest.fixture
285-
def proxy_arp_enabled(packets_for_test, rand_selected_dut, config_facts):
285+
def proxy_arp_enabled(request, rand_selected_dut, config_facts):
286286
"""
287287
Tries to enable proxy ARP for each VLAN on the ToR
288288
@@ -303,7 +303,6 @@ def proxy_arp_enabled(packets_for_test, rand_selected_dut, config_facts):
303303
vlan_ids = [vlans[vlan]['vlanid'] for vlan in list(vlans.keys())]
304304
old_proxy_arp_vals = {}
305305
new_proxy_arp_vals = []
306-
ip_version, _, _ = packets_for_test
307306

308307
# Enable proxy ARP/NDP for the VLANs on the DUT
309308
for vid in vlan_ids:
@@ -316,7 +315,7 @@ def proxy_arp_enabled(packets_for_test, rand_selected_dut, config_facts):
316315
new_proxy_arp_res = duthost.shell(proxy_arp_check_cmd.format(vid))
317316
new_proxy_arp_vals.append(new_proxy_arp_res['stdout'])
318317

319-
if ip_version == 'v6':
318+
if 'ipv6' in request.node.name:
320319
# Allow time for ndppd to reset and startup
321320
time.sleep(30)
322321

0 commit comments

Comments
 (0)