Skip to content

Use pytest option for swapping syncd in dscp remapping test #10074

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

Merged
bingwang-ms merged 1 commit into from
Sep 26, 2023
Merged

Use pytest option for swapping syncd in dscp remapping test #10074

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
32 changes: 17 additions & 15 deletions tests/qos/tunnel_qos_remap_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,22 +344,24 @@ def _remove_ssh_tunnel_to_syncd_rpc(duthost):

@pytest.fixture(scope='module')
def swap_syncd(request, rand_selected_dut, creds):
public_docker_reg = request.config.getoption("--public_docker_registry")
new_creds = None
if public_docker_reg:
new_creds = copy.deepcopy(creds)
new_creds['docker_registry_host'] = new_creds['public_docker_registry_host']
new_creds['docker_registry_username'] = ''
new_creds['docker_registry_password'] = ''
else:
new_creds = creds
# Swap syncd container
docker.swap_syncd(rand_selected_dut, new_creds)
_create_ssh_tunnel_to_syncd_rpc(rand_selected_dut)
if request.config.getoption("--qos_swap_syncd"):
public_docker_reg = request.config.getoption("--public_docker_registry")
new_creds = None
if public_docker_reg:
new_creds = copy.deepcopy(creds)
new_creds['docker_registry_host'] = new_creds['public_docker_registry_host']
new_creds['docker_registry_username'] = ''
new_creds['docker_registry_password'] = ''
else:
new_creds = creds
# Swap syncd container
docker.swap_syncd(rand_selected_dut, new_creds)
_create_ssh_tunnel_to_syncd_rpc(rand_selected_dut)
yield
# Restore syncd container
docker.restore_default_syncd(rand_selected_dut, new_creds)
_remove_ssh_tunnel_to_syncd_rpc(rand_selected_dut)
if request.config.getoption("--qos_swap_syncd"):
# Restore syncd container
docker.restore_default_syncd(rand_selected_dut, new_creds)
_remove_ssh_tunnel_to_syncd_rpc(rand_selected_dut)


def _update_docker_service(duthost, docker="", action="", service=""):
Expand Down