Skip to content
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.

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

Enhance test_ro_disk to ensure device finally be recovered by PDU reboot #14343

Merged
merged 1 commit into from
Sep 1, 2024

Conversation

lizhijianrd
Copy link
Contributor

@lizhijianrd lizhijianrd commented Aug 30, 2024

Description of PR

Summary:
In PR #13974, I introduced PDU reboot to recover the DUT from RO-Disk state when regular sudo reboot fail to do that. However, the do_reboot function may raise pytest_ansible.errors.AnsibleConnectionFailure which is not be handled. In this case, the PDU reboot part cannot be executed and DUT cannot be recovered.

In this PR, I enhance the code from below perspectives:

  1. Handle pytest_ansible.errors.AnsibleConnectionFailure in do_reboot function.
  2. Add try-except block for do_reboot to ensure no matter what Exception is raised, PDU reboot can always be executed to recover the DUT.

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • Test case(new/improvement)

Back port request

  • 202012
  • 202205
  • 202305
  • 202311
  • 202405

Approach

What is the motivation for this PR?

In PR #13974, I introduced PDU reboot to recover the DUT from RO-Disk state when regular sudo reboot fail to do that. However, the do_reboot function may raise pytest_ansible.errors.AnsibleConnectionFailure which is not be handled. In this case, the PDU reboot part cannot be executed and DUT cannot be recovered.
In this PR, I enhance the testcase to ensure PDU reboot is always executed when regular reboot fail.

How did you do it?

  1. Handle pytest_ansible.errors.AnsibleConnectionFailure in do_reboot function.
  2. Add try-except block for do_reboot to ensure no matter what Exception is raised, PDU reboot can always be executed to recover the DUT.

How did you verify/test it?

Verified by run test_ro_disk on Nokia-7215 testbeds.

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

@StormLiangMS StormLiangMS merged commit 7ba6910 into sonic-net:master Sep 1, 2024
18 checks passed
mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request Sep 1, 2024
…oot (sonic-net#14343)

What is the motivation for this PR?
In PR sonic-net#13974, I introduced PDU reboot to recover the DUT from RO-Disk state when regular sudo reboot fail to do that. However, the do_reboot function may raise pytest_ansible.errors.AnsibleConnectionFailure which is not be handled. In this case, the PDU reboot part cannot be executed and DUT cannot be recovered.
In this PR, I enhance the testcase to ensure PDU reboot is always executed when regular reboot fail.

How did you do it?
Handle pytest_ansible.errors.AnsibleConnectionFailure in do_reboot function.
Add try-except block for do_reboot to ensure no matter what Exception is raised, PDU reboot can always be executed to recover the DUT.
How did you verify/test it?
Verified by run test_ro_disk on Nokia-7215 testbeds.
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202405: #14351

mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request Sep 1, 2024
…oot (sonic-net#14343)

What is the motivation for this PR?
In PR sonic-net#13974, I introduced PDU reboot to recover the DUT from RO-Disk state when regular sudo reboot fail to do that. However, the do_reboot function may raise pytest_ansible.errors.AnsibleConnectionFailure which is not be handled. In this case, the PDU reboot part cannot be executed and DUT cannot be recovered.
In this PR, I enhance the testcase to ensure PDU reboot is always executed when regular reboot fail.

How did you do it?
Handle pytest_ansible.errors.AnsibleConnectionFailure in do_reboot function.
Add try-except block for do_reboot to ensure no matter what Exception is raised, PDU reboot can always be executed to recover the DUT.
How did you verify/test it?
Verified by run test_ro_disk on Nokia-7215 testbeds.
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202311: #14352

mssonicbld pushed a commit that referenced this pull request Sep 1, 2024
…oot (#14343)

What is the motivation for this PR?
In PR #13974, I introduced PDU reboot to recover the DUT from RO-Disk state when regular sudo reboot fail to do that. However, the do_reboot function may raise pytest_ansible.errors.AnsibleConnectionFailure which is not be handled. In this case, the PDU reboot part cannot be executed and DUT cannot be recovered.
In this PR, I enhance the testcase to ensure PDU reboot is always executed when regular reboot fail.

How did you do it?
Handle pytest_ansible.errors.AnsibleConnectionFailure in do_reboot function.
Add try-except block for do_reboot to ensure no matter what Exception is raised, PDU reboot can always be executed to recover the DUT.
How did you verify/test it?
Verified by run test_ro_disk on Nokia-7215 testbeds.
@lizhijianrd lizhijianrd deleted the enhance-test-ro-disk branch September 2, 2024 02:56
mssonicbld pushed a commit that referenced this pull request Sep 2, 2024
…oot (#14343)

What is the motivation for this PR?
In PR #13974, I introduced PDU reboot to recover the DUT from RO-Disk state when regular sudo reboot fail to do that. However, the do_reboot function may raise pytest_ansible.errors.AnsibleConnectionFailure which is not be handled. In this case, the PDU reboot part cannot be executed and DUT cannot be recovered.
In this PR, I enhance the testcase to ensure PDU reboot is always executed when regular reboot fail.

How did you do it?
Handle pytest_ansible.errors.AnsibleConnectionFailure in do_reboot function.
Add try-except block for do_reboot to ensure no matter what Exception is raised, PDU reboot can always be executed to recover the DUT.
How did you verify/test it?
Verified by run test_ro_disk on Nokia-7215 testbeds.
hdwhdw pushed a commit to hdwhdw/sonic-mgmt that referenced this pull request Sep 20, 2024
…oot (sonic-net#14343)

What is the motivation for this PR?
In PR sonic-net#13974, I introduced PDU reboot to recover the DUT from RO-Disk state when regular sudo reboot fail to do that. However, the do_reboot function may raise pytest_ansible.errors.AnsibleConnectionFailure which is not be handled. In this case, the PDU reboot part cannot be executed and DUT cannot be recovered.
In this PR, I enhance the testcase to ensure PDU reboot is always executed when regular reboot fail.

How did you do it?
Handle pytest_ansible.errors.AnsibleConnectionFailure in do_reboot function.
Add try-except block for do_reboot to ensure no matter what Exception is raised, PDU reboot can always be executed to recover the DUT.
How did you verify/test it?
Verified by run test_ro_disk on Nokia-7215 testbeds.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants