Merge "Ensure that all nodes goes offline after shutting them off" into stable/newton

This commit is contained in:
Jenkins 2017-03-28 10:10:38 +00:00 committed by Gerrit Code Review
commit 8f2f694c34
2 changed files with 7 additions and 0 deletions

View File

@ -2237,6 +2237,11 @@ class FuelWebClient29(object):
for node in nodes:
self.wait_node_is_online(node, timeout=timeout)
@logwrap
def wait_nodes_get_offline_state(self, nodes, timeout=4 * 60):
for node in nodes:
self.wait_node_is_offline(node, timeout=timeout)
@logwrap
def wait_cluster_nodes_get_online_state(self, cluster_id,
timeout=4 * 60):

View File

@ -74,6 +74,8 @@ class RepeatableImageBased(TestBasic):
timeout_msg='Nodes failed to become online')
for slave in self.env.d_env.nodes().slaves[:5]:
slave.destroy()
self.fuel_web.wait_nodes_get_offline_state(
self.env.d_env.nodes().slaves[:5], timeout=10 * 60)
self.env.make_snapshot("deploy_after_delete", is_make=True)