[Bug]: Reboot shouldn't always force min 900s wait on T2 devices

[Javier-Tan]

Issue Description

Currently, using reboot function from tests/common/reboot.py forces wait variable to be at least 900s when called from T2 device, through:

        if duthost.get_facts().get("modular_chassis"):
            wait = max(wait, 900)
            timeout = max(timeout, 600)

This may cause tests that rely on a wait being shorter than 900s to fail. e.g. bgp/test_startup_tsa_tsb_service.py calls reboot(suphost, localhost, wait=240) and must check for a certain condition before 900s has passed due to a timer STARTUP_TSB_TIMER=900 or it will fail.

Proposed solution:
Add safe reboot as a flag

        if duthost.get_facts().get("modular_chassis") and safe_reboot:
            wait = max(wait, 900)
            timeout = max(timeout, 600)

This change may cause changes in other tests calling reboot e.g.:

• A cold reboot when safe reboot is off, default values would be wait = 120; timer = 300 defined from reboot_ctrl_dict[REBOOT_TYPE_COLD], wait value would be respected if defined in reboot function.

Results you see

Reboot wait variable must be at least 900s for reboot from chassis DUTs.

Results you expected to see

Reboot wait variable should be respected if defined without safe_reboot flag.

Is it platform specific

generic

Relevant log output

N/A

Output of show version

Version agnostic issue

Attach files (if any)

N/A

[Javier-Tan]

@arlakshm for vis

[Javier-Tan]

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 > default values in reboot_ctrl_dict

I'm unsure if we want to set a default of wait = 900 and timeout = 600 if wait and timeout are not explicitly defined for a T2 DUT?