Enforce fuel_slave nodes to get slaves
This will fix cases, when we try to get nailgun node for master Without this patch test is unstable Closes-bug: #1630553 Change-Id: I96a82881d775359462130b89604c0935ee5d7be7
This commit is contained in:
parent
a87ec53f71
commit
5430f44d64
|
@ -181,9 +181,12 @@ class NetworkOutage(TestBasic):
|
||||||
logger.debug(benchmark_results[tag].show())
|
logger.debug(benchmark_results[tag].show())
|
||||||
|
|
||||||
self.show_step(5)
|
self.show_step(5)
|
||||||
nodes = [node for node in self.env.d_env.get_nodes()
|
nodes = [
|
||||||
if node.driver.node_active(node)]
|
node for node in sorted(
|
||||||
for interface in nodes[1].interfaces:
|
self.env.d_env.get_nodes(role='fuel_slave'),
|
||||||
|
key=lambda x: x.name)
|
||||||
|
if node.driver.node_active(node)]
|
||||||
|
for interface in nodes[0].interfaces:
|
||||||
if interface.is_blocked:
|
if interface.is_blocked:
|
||||||
raise Exception('Interface {0} is blocked'.format(interface))
|
raise Exception('Interface {0} is blocked'.format(interface))
|
||||||
else:
|
else:
|
||||||
|
@ -193,7 +196,7 @@ class NetworkOutage(TestBasic):
|
||||||
time.sleep(60 * 5)
|
time.sleep(60 * 5)
|
||||||
|
|
||||||
self.show_step(7)
|
self.show_step(7)
|
||||||
for interface in nodes[1].interfaces:
|
for interface in nodes[0].interfaces:
|
||||||
if interface.network.is_blocked:
|
if interface.network.is_blocked:
|
||||||
interface.network.unblock()
|
interface.network.unblock()
|
||||||
else:
|
else:
|
||||||
|
@ -201,7 +204,7 @@ class NetworkOutage(TestBasic):
|
||||||
'Interface {0} was not blocked'.format(interface))
|
'Interface {0} was not blocked'.format(interface))
|
||||||
|
|
||||||
self.show_step(8)
|
self.show_step(8)
|
||||||
self.fuel_web.wait_nodes_get_online_state(nodes[1:])
|
self.fuel_web.wait_nodes_get_online_state(nodes)
|
||||||
|
|
||||||
self.show_step(9)
|
self.show_step(9)
|
||||||
self.fuel_web.verify_network(cluster_id)
|
self.fuel_web.verify_network(cluster_id)
|
||||||
|
@ -363,9 +366,12 @@ class NetworkOutage(TestBasic):
|
||||||
logger.debug(benchmark_results[tag].show())
|
logger.debug(benchmark_results[tag].show())
|
||||||
|
|
||||||
self.show_step(5)
|
self.show_step(5)
|
||||||
nodes = [node for node in self.env.d_env.get_nodes()
|
nodes = [
|
||||||
if node.driver.node_active(node)]
|
node for node in sorted(
|
||||||
for interface in nodes[1].interfaces:
|
self.env.d_env.get_nodes(role='fuel_slave'),
|
||||||
|
key=lambda x: x.name)
|
||||||
|
if node.driver.node_active(node)]
|
||||||
|
for interface in nodes[0].interfaces:
|
||||||
if interface.is_blocked:
|
if interface.is_blocked:
|
||||||
raise Exception('Interface {0} is blocked'.format(interface))
|
raise Exception('Interface {0} is blocked'.format(interface))
|
||||||
else:
|
else:
|
||||||
|
@ -374,7 +380,7 @@ class NetworkOutage(TestBasic):
|
||||||
self.show_step(6)
|
self.show_step(6)
|
||||||
time.sleep(60 * 5)
|
time.sleep(60 * 5)
|
||||||
self.show_step(7)
|
self.show_step(7)
|
||||||
for interface in nodes[1].interfaces:
|
for interface in nodes[0].interfaces:
|
||||||
if interface.network.is_blocked:
|
if interface.network.is_blocked:
|
||||||
interface.network.unblock()
|
interface.network.unblock()
|
||||||
else:
|
else:
|
||||||
|
@ -382,7 +388,7 @@ class NetworkOutage(TestBasic):
|
||||||
'Interface {0} was not blocked'.format(interface))
|
'Interface {0} was not blocked'.format(interface))
|
||||||
|
|
||||||
self.show_step(8)
|
self.show_step(8)
|
||||||
self.fuel_web.wait_nodes_get_online_state(nodes[1:])
|
self.fuel_web.wait_nodes_get_online_state(nodes)
|
||||||
|
|
||||||
self.show_step(9)
|
self.show_step(9)
|
||||||
self.fuel_web.verify_network(cluster_id)
|
self.fuel_web.verify_network(cluster_id)
|
||||||
|
|
Loading…
Reference in New Issue