From cc113ae97351f5a486e84cda65c380841e6c54a3 Mon Sep 17 00:00:00 2001 From: Elad Ben Aharon Date: Fri, 11 Sep 2020 21:00:09 +0300 Subject: [PATCH] vSphere: Do cold power off in node restart scnenarios instead of graceful OS shutdown (#2921) * vSphere: Do cold power off in node restart scnenarios instead of graceful OS shutdown Signed-off-by: Elad Ben Aharon * Fix Signed-off-by: Elad Ben Aharon * Fix Signed-off-by: Elad Ben Aharon --- ocs_ci/ocs/platform_nodes.py | 8 +------- tests/manage/z_cluster/nodes/test_nodes_restart.py | 4 ++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/ocs_ci/ocs/platform_nodes.py b/ocs_ci/ocs/platform_nodes.py index ab98e2aaff5..9c3a44b38ef 100644 --- a/ocs_ci/ocs/platform_nodes.py +++ b/ocs_ci/ocs/platform_nodes.py @@ -259,7 +259,7 @@ def start_nodes(self, nodes, wait=True): ) self.vsphere.start_vms(vms) - def restart_nodes(self, nodes, force=False, timeout=300, wait=True): + def restart_nodes(self, nodes, force=True, timeout=300, wait=True): """ Restart vSphere VMs @@ -289,16 +289,10 @@ def restart_nodes(self, nodes, force=False, timeout=300, wait=True): OCP node reaches status Ready. """ nodes_names = [n.name for n in nodes] - logger.info( - f"Waiting for nodes: {nodes_names} to reach not ready state" - ) wait_for_nodes_status( node_names=nodes_names, status=constants.NODE_NOT_READY, timeout=timeout ) - logger.info( - f"Waiting for nodes: {nodes_names} to reach ready state" - ) wait_for_nodes_status( node_names=nodes_names, status=constants.NODE_READY, timeout=timeout diff --git a/tests/manage/z_cluster/nodes/test_nodes_restart.py b/tests/manage/z_cluster/nodes/test_nodes_restart.py index 9fb689c5d6c..634a5d8ffcd 100644 --- a/tests/manage/z_cluster/nodes/test_nodes_restart.py +++ b/tests/manage/z_cluster/nodes/test_nodes_restart.py @@ -68,8 +68,8 @@ def test_rolling_nodes_restart(self, nodes, pvc_factory, pod_factory): """ ocp_nodes = get_node_objs() for node in ocp_nodes: - nodes.restart_nodes(nodes=[node]) - self.sanity_helpers.health_check(cluster_check=False) + nodes.restart_nodes(nodes=[node], wait=False) + self.sanity_helpers.health_check(cluster_check=False, tries=60) self.sanity_helpers.create_resources(pvc_factory, pod_factory) @pytest.mark.parametrize(