Skip to content

[action] [PR:22340] Fix check_config_applied logic in set_dual_tor_state_to_orchagent #22720

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.

Sign up for GitHub

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

Open
mssonicbld wants to merge 1 commit into
base: 202511
Choose a base branch
from
+7 −4
Open

[action] [PR:22340] Fix check_config_applied logic in set_dual_tor_state_to_orchagent #22720

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions tests/common/dualtor/dual_tor_mock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,12 @@ def set_dual_tor_state_to_orchagent(dut, state, tor_mux_intfs): # noqa:
"""
Helper function for setting active/standby state to orchagent
"""
def check_config_applied(num_tor_mux_intfs):
out = dut.shell('redis-cli -n 0 keys "MUX_CABLE_TABLE:*" | wc -l')
return out['stdout_lines'][0] == str(num_tor_mux_intfs)
def check_config_applied():
for intf in tor_mux_intfs:
out = dut.shell('redis-cli -n 0 HGET "MUX_CABLE_TABLE:{}" "state"'.format(intf))
if out['stdout_lines'][0] != state:
return False
return True
logger.info("Applying {} state to orchagent".format(state))

intf_configs = []
Expand Down Expand Up @@ -101,7 +104,7 @@ def check_config_applied(num_tor_mux_intfs):
logger.debug('SWSS config string is {}'.format(swss_config_str))
swss_filename = '/mux{}.json'.format(state)
_apply_config_to_swss(dut, swss_config_str, swss_filename)
wait_until(120, 5, 5, check_config_applied, len(tor_mux_intfs))
wait_until(120, 10, 5, check_config_applied)


def del_dual_tor_state_from_orchagent(dut, state, tor_mux_intfs): # noqa: F811
Expand Down
Loading