Change behaviour of wait and timeout assignment for T2 devices

[Javier-Tan]

Description of PR

Summary:
Fixes #14840

Changed behaviour of forcing minimum wait and timeout times for reboot on T2 devices to only trigger when safe_reboot == True

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?

Tests were failing when because of the minimum 900s wait time during reboot for T2 devices, despite explicitly setting wait time.

How did you do it?

Changed behaviour of forcing minimum wait and timeout times for reboot on T2 devices to only trigger when safe_reboot == True

How did you verify/test it?

Tested on T2 testbed to confirm that the effective priority to define wait and timeout variables would now be:
900, 600 for T2 DUT & safe reboot >
values defined in inv >
explicitly defined wait and timeout during function call >
default values in reboot_ctrl_dict

Any platform specific information?

Platform agnostic

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

N/A

Documentation

N/A