Skip to content

Commit

Permalink
Put back sonic-net#11934, fix qos/test_qos_sai.py teardown for dualto…
Browse files Browse the repository at this point in the history
…r. (sonic-net#12503)

What is the motivation for this PR?
qos/test_qos_sai.py fails at teardown

failed on setup with "Failed: All critical services should be fully started!
Regression introduced by sonic-net#10651 for dualtor.

How did you do it?
The config_reload in the fixture dut_disable_ipv6 waits until all critical processes are up after issuing config reload command and it timeouts in case of dualtor because mux container doesn't come up. Mux container is disabled by another fixture stopServices in the same file. These two fixtures have no dependency on each other hence the execution can happen in any order, so if the teardown of dut_disable_ipv6 happens before stopServices then this issue is seen.

This change ensures that the teardown of stopServices happens before dut_disable_ipv6 so that mux is no longer disabled at the time of config_reload.

How did you verify/test it?
Ran qos/test_qos_sai.py on Arista-7260CX3 platform with dualtor topology with 202305 and 202311 images.
  • Loading branch information
vivekverma-arista authored May 14, 2024
1 parent 066b742 commit 5f6b931
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tests/qos/qos_sai_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -1271,7 +1271,7 @@ def updateIptables(self, duthosts, get_src_dst_asic_and_duts, swapSyncd_on_selec

@pytest.fixture(scope='class')
def stopServices(
self, duthosts, get_src_dst_asic_and_duts,
self, duthosts, get_src_dst_asic_and_duts, dut_disable_ipv6,
swapSyncd_on_selected_duts, enable_container_autorestart, disable_container_autorestart, get_mux_status, # noqa F811
tbinfo, upper_tor_host, lower_tor_host, toggle_all_simulator_ports): # noqa F811
"""
Expand Down

0 comments on commit 5f6b931

Please sign in to comment.