[cherry pick master PR] Improvising pre_checks for test_reload config (#8843)

Description of PR
This is cherry-pick of #7953

* Update multi_asic.py

* Update sonic.py

* added flag plt_reboot_ctrl_overwrite in reboot function to decide whether we want to overwrite wait and timeout.

added a flag plt_reboot_ctrl_overwrite in reboot function to decide whether we want to overwrite wait and timeout. by default is to overwrite, in this test test_reload_configuration_checks we don't want to wait for that long, we want to catch transient error, so the flag is False.

* changed to run on every sku with enum_rand_one_per_hwsku_hostname

co-authorized by: [email protected]

Author: wenyiz2021

tests/common/reboot.py

@@ -195,7 +195,7 @@ def execute_reboot_helper():
 
 def reboot(duthost, localhost, reboot_type='cold', delay=10,
            timeout=0, wait=0, wait_for_ssh=True, wait_warmboot_finalizer=False, warmboot_finalizer_timeout=0,
-           reboot_helper=None, reboot_kwargs=None):
+           reboot_helper=None, reboot_kwargs=None, plt_reboot_ctrl_overwrite=True):
     """
     reboots DUT
     :param duthost: DUT host object
@@ -221,9 +221,10 @@ def reboot(duthost, localhost, reboot_type='cold', delay=10,
             timeout = reboot_ctrl['timeout']
         if wait == 0:
             wait = reboot_ctrl['wait']
-        if plt_reboot_ctrl:
-            wait = plt_reboot_ctrl['wait']
-            timeout = plt_reboot_ctrl['timeout']
+        if plt_reboot_ctrl_overwrite and plt_reboot_ctrl:
+            # get 'wait' and 'timeout' from inventory if they are specified, otherwise use current values
+            wait = plt_reboot_ctrl.get('wait', wait)
+            timeout = plt_reboot_ctrl.get('timeout', timeout)
         if warmboot_finalizer_timeout == 0 and 'warmboot_finalizer_timeout' in reboot_ctrl:
             warmboot_finalizer_timeout = reboot_ctrl['warmboot_finalizer_timeout']
     except KeyError:

tests/platform_tests/test_reload_config.py

@@ -22,7 +22,8 @@
     pytest.mark.topology('any')
 ]
 
-def test_reload_configuration(duthosts, rand_one_dut_hostname, conn_graph_facts, xcvr_skip_list):
+def test_reload_configuration(duthosts, enum_rand_one_per_hwsku_hostname,
+                              conn_graph_facts, xcvr_skip_list):
     """
     @summary: This test case is to reload the configuration and check platform status
     """
@@ -75,7 +76,8 @@ def check_database_status(duthost):
 
     return True
 
-def test_reload_configuration_checks(duthosts, rand_one_dut_hostname, localhost, conn_graph_facts, xcvr_skip_list):
+def test_reload_configuration_checks(duthosts, enum_rand_one_per_hwsku_hostname,
+                                     localhost, conn_graph_facts, xcvr_skip_list):
     """
     @summary: This test case is to test various system checks in config reload
     """
@@ -84,7 +86,8 @@ def test_reload_configuration_checks(duthosts, rand_one_dut_hostname, localhost,
     if not config_force_option_supported(duthost):
         return
 
-    reboot(duthost, localhost, reboot_type="cold", wait=5)
+    reboot(duthost, localhost, reboot_type="cold", wait=5,
+           plt_reboot_ctrl_overwrite=False)
 
     # Check if all database containers have started
     wait_until(60, 1, 0, check_database_status, duthost)
@@ -104,6 +107,10 @@ def test_reload_configuration_checks(duthosts, rand_one_dut_hostname, localhost,
 
     # Immediately after one config reload command, another shouldn't execute and wait for system checks
     logging.info("Checking config reload after system is up")
+    # Check if all database containers have started
+    wait_until(60, 1, 0, check_database_status, duthost)
+    # Check if interfaces-config.service is exited
+    wait_until(60, 1, 0, check_interfaces_config_service_status, duthost)
     out = duthost.shell("sudo config reload -y", executable="/bin/bash", module_ignore_errors=True)
     assert "Retry later" in out['stdout']
     assert wait_until(300, 20, 0, config_system_checks_passed, duthost)