From bba3ee4a52db0fe295357507d8cd1a49a74e090f Mon Sep 17 00:00:00 2001 From: Victor Ryzhenkin Date: Fri, 25 Nov 2016 15:34:18 +0300 Subject: [PATCH] Wait cluster readiness in failover tests Change-Id: Ifc872b5b70e5a64d1ebfa447e4ae5a93ba716c2f --- murano_plugin_tests/helpers/helpers.py | 4 ++++ murano_plugin_tests/murano_plugin/api.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/murano_plugin_tests/helpers/helpers.py b/murano_plugin_tests/helpers/helpers.py index bed237c..8190e5b 100644 --- a/murano_plugin_tests/helpers/helpers.py +++ b/murano_plugin_tests/helpers/helpers.py @@ -736,3 +736,7 @@ class PluginHelper(object): cmd = "yum clean all" self.ssh_manager.execute_on_remote( ip, cmd, err_msg="yum cache flush unsuccessful") + + def wait_os_cluster_readiness(self, timeout=15 * 60): + self.fuel_web.assert_os_services_ready(self.cluster_id, + timeout=timeout) diff --git a/murano_plugin_tests/murano_plugin/api.py b/murano_plugin_tests/murano_plugin/api.py index c6e14c5..2137633 100644 --- a/murano_plugin_tests/murano_plugin/api.py +++ b/murano_plugin_tests/murano_plugin/api.py @@ -163,7 +163,7 @@ class MuranoPluginApi(object): target_node = fuel_web_client.get_devops_nodes_by_nailgun_nodes( nailgun_nodes[:1]) operations[operation](target_node) - self.wait_plugin_online() + self.helpers.wait_os_cluster_readiness() def apply_maintenance_update(self): """Method applies maintenance updates on whole cluster